From 16db2c4e573e4a8d24b70d15688b92f7c39581ae Mon Sep 17 00:00:00 2001
From: fdb02983rhy <91766386+fdb02983rhy@users.noreply.github.com>
Date: Tue, 12 Nov 2024 00:53:12 +0900
Subject: [PATCH] Fix: Set Celery LOG_File only when available, always log to
 console (#10563)

---
 api/extensions/ext_celery.py  |  6 +++++-
 api/extensions/ext_logging.py | 12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index c5de7395b..42012eee8 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -46,7 +46,6 @@ def init_app(app: Flask) -> Celery:
         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),
     )
@@ -56,6 +55,11 @@ def init_app(app: Flask) -> Celery:
             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
 
diff --git a/api/extensions/ext_logging.py b/api/extensions/ext_logging.py
index 56b1d6bd2..a15c73bd7 100644
--- a/api/extensions/ext_logging.py
+++ b/api/extensions/ext_logging.py
@@ -9,19 +9,21 @@ from configs import dify_config
 
 
 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,