Skip to content

Commit

Permalink
Fix: Set Celery LOG_File only when available, always log to console (l…
Browse files Browse the repository at this point in the history
  • Loading branch information
fdb02983rhy authored Nov 11, 2024
1 parent bd4a61a commit 16db2c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
6 changes: 5 additions & 1 deletion api/extensions/ext_celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def __call__(self, *args: object, **kwargs: object) -> object:
broker_connection_retry_on_startup=True,
worker_log_format=dify_config.LOG_FORMAT,
worker_task_log_format=dify_config.LOG_FORMAT,
worker_logfile=dify_config.LOG_FILE,
worker_hijack_root_logger=False,
timezone=pytz.timezone(dify_config.LOG_TZ),
)
Expand All @@ -56,6 +55,11 @@ def __call__(self, *args: object, **kwargs: object) -> object:
broker_use_ssl=ssl_options, # Add the SSL options to the broker configuration
)

if dify_config.LOG_FILE:
celery_app.conf.update(
worker_logfile=dify_config.LOG_FILE,
)

celery_app.set_default()
app.extensions["celery"] = celery_app

Expand Down
12 changes: 7 additions & 5 deletions api/extensions/ext_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@


def init_app(app: Flask):
log_handlers = None
log_handlers = []
log_file = dify_config.LOG_FILE
if log_file:
log_dir = os.path.dirname(log_file)
os.makedirs(log_dir, exist_ok=True)
log_handlers = [
log_handlers.append(
RotatingFileHandler(
filename=log_file,
maxBytes=dify_config.LOG_FILE_MAX_SIZE * 1024 * 1024,
backupCount=dify_config.LOG_FILE_BACKUP_COUNT,
),
logging.StreamHandler(sys.stdout),
]
)
)

# Always add StreamHandler to log to console
log_handlers.append(logging.StreamHandler(sys.stdout))

logging.basicConfig(
level=dify_config.LOG_LEVEL,
Expand Down

0 comments on commit 16db2c4

Please sign in to comment.