From 68d41cf0285e2e303c99fffeca059da278802ca4 Mon Sep 17 00:00:00 2001 From: Wu Clan Date: Thu, 27 Feb 2025 15:38:41 +0800 Subject: [PATCH] Add log module root and output levels (#534) --- backend/common/log.py | 7 ++++--- backend/core/conf.py | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backend/common/log.py b/backend/common/log.py index f4baf54c..bd7283a2 100644 --- a/backend/common/log.py +++ b/backend/common/log.py @@ -41,7 +41,7 @@ def setup_logging(): """ # Set the logging handler and level logging.root.handlers = [InterceptHandler()] - logging.root.setLevel('NOTSET') + logging.root.setLevel(settings.LOG_STD_LEVEL) # Remove all log handlers and propagate to root logger for name in logging.root.manager.loggerDict.keys(): @@ -69,6 +69,7 @@ def setup_logging(): handlers=[ { 'sink': sys.stdout, + 'level': settings.LOG_STD_LEVEL, 'filter': lambda record: correlation_id_filter(record), 'format': settings.LOG_STD_FORMAT, } @@ -98,7 +99,7 @@ def set_custom_logfile(): # stdout file logger.add( str(log_access_file), - level=settings.LOG_ACCESS_LEVEL, + level=settings.LOG_ACCESS_FILE_LEVEL, filter=lambda record: record['level'].no <= 25, backtrace=False, diagnose=False, @@ -108,7 +109,7 @@ def set_custom_logfile(): # stderr file logger.add( str(log_error_file), - level=settings.LOG_ERROR_LEVEL, + level=settings.LOG_ERROR_FILE_LEVEL, filter=lambda record: record['level'].no >= 30, backtrace=True, diagnose=True, diff --git a/backend/core/conf.py b/backend/core/conf.py index 204c867a..f9ea7642 100644 --- a/backend/core/conf.py +++ b/backend/core/conf.py @@ -95,6 +95,11 @@ class Settings(BaseSettings): COOKIE_REFRESH_TOKEN_EXPIRE_SECONDS: int = TOKEN_REFRESH_EXPIRE_SECONDS # Log + LOG_CID_DEFAULT_VALUE: str = '-' + LOG_CID_UUID_LENGTH: int = 32 # must <= 32 + LOG_STD_LEVEL: str = 'INFO' + LOG_ACCESS_FILE_LEVEL: str = 'INFO' + LOG_ERROR_FILE_LEVEL: str = 'ERROR' LOG_STD_FORMAT: str = ( '{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | ' ' {correlation_id} | {message}' @@ -103,10 +108,6 @@ class Settings(BaseSettings): '{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | ' ' {correlation_id} | {message}' ) - LOG_CID_DEFAULT_VALUE: str = '-' - LOG_CID_UUID_LENGTH: int = 32 # must <= 32 - LOG_ACCESS_LEVEL: str = 'INFO' - LOG_ERROR_LEVEL: str = 'ERROR' LOG_ACCESS_FILENAME: str = 'fba_access.log' LOG_ERROR_FILENAME: str = 'fba_error.log'