From eb6c0b802737a2ed619f8a3bee8df73231398d98 Mon Sep 17 00:00:00 2001
From: crazywoola <100913391+crazywoola@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:24:22 +0800
Subject: [PATCH] Fix/log tz (#10473)

---
 api/.env.example                | 4 ++++
 api/configs/feature/__init__.py | 2 +-
 docker/.env.example             | 4 ++++
 docker/docker-compose.yaml      | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/api/.env.example b/api/.env.example
index dbc402d34b..5751605b48 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -367,6 +367,10 @@ LOG_FILE=
 LOG_FILE_MAX_SIZE=20
 # Log file max backup count
 LOG_FILE_BACKUP_COUNT=5
+# Log dateformat
+LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
+# Log Timezone
+LOG_TZ=UTC
 
 # Indexing configuration
 INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=1000
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index 23ccba60a2..f368a19469 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -376,7 +376,7 @@ class LoggingConfig(BaseSettings):
 
     LOG_TZ: Optional[str] = Field(
         description="Timezone for log timestamps (e.g., 'America/New_York')",
-        default=None,
+        default="UTC",
     )
 
 
diff --git a/docker/.env.example b/docker/.env.example
index 12443ee7f2..0b181d831a 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -54,6 +54,10 @@ LOG_FILE=
 LOG_FILE_MAX_SIZE=20
 # Log file max backup count
 LOG_FILE_BACKUP_COUNT=5
+# Log dateformat
+LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
+# Log Timezone
+LOG_TZ=UTC
 
 # Debug mode, default is false.
 # It is recommended to turn on this configuration for local development
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 6dcc3750c9..fcc0c56216 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -4,6 +4,10 @@ x-shared-env: &shared-api-worker-env
   LOG_FILE: ${LOG_FILE:-}
   LOG_FILE_MAX_SIZE: ${LOG_FILE_MAX_SIZE:-20}
   LOG_FILE_BACKUP_COUNT: ${LOG_FILE_BACKUP_COUNT:-5}
+  # Log dateformat
+  LOG_DATEFORMAT: ${LOG_DATEFORMAT:-%Y-%m-%d %H:%M:%S}
+  # Log Timezone
+  LOG_TZ: ${LOG_TZ:-UTC}
   DEBUG: ${DEBUG:-false}
   FLASK_DEBUG: ${FLASK_DEBUG:-false}
   SECRET_KEY: ${SECRET_KEY:-sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U}