更新日志输出和写入配置 (#35)

Author: wu-clan

backend/common/log.py

@@ -3,8 +3,8 @@
 import inspect
 import logging
 import os
+import sys
 
-from sys import stderr, stdout
 
 from loguru import logger
 
@@ -41,7 +41,7 @@ def setup_logging():
     """
     # Intercept everything at the root logger
     logging.root.handlers = [InterceptHandler()]
-    logging.root.setLevel(settings.LOG_ROOT_LEVEL)
+    logging.root.setLevel(settings.LOG_STD_LEVEL)
 
     # Remove all log handlers and propagate to root logger
     for name in logging.root.manager.loggerDict.keys():
@@ -54,62 +54,58 @@ def setup_logging():
         # Debug log handlers
         # logging.debug(f'{logging.getLogger(name)}, {logging.getLogger(name).propagate}')
 
-    # Remove every other logger's handlers
+    # Remove default loguru logger
     logger.remove()
 
-    # Configure loguru logger before starts logging
+    # Set the loguru default handlers
     logger.configure(
         handlers=[
             {
-                'sink': stdout,
-                'level': settings.LOG_STDOUT_LEVEL,
-                'filter': lambda record: record['level'].no <= 25,
+                'sink': sys.stdout,
+                'level': settings.LOG_STD_LEVEL,
                 'format': settings.LOG_STD_FORMAT,
-            },
-            {
-                'sink': stderr,
-                'level': settings.LOG_STDERR_LEVEL,
-                'filter': lambda record: record['level'].no >= 30,
-                'format': settings.LOG_STD_FORMAT,
-            },
+            }
         ]
     )
 
 
-def set_customize_logfile():
+def set_custom_logfile():
     log_path = path_conf.LOG_DIR
     if not os.path.exists(log_path):
         os.mkdir(log_path)
 
     # log files
-    log_stdout_file = os.path.join(log_path, settings.LOG_STDOUT_FILENAME)
-    log_stderr_file = os.path.join(log_path, settings.LOG_STDERR_FILENAME)
+    log_access_file = os.path.join(log_path, settings.LOG_ACCESS_FILENAME)
+    log_error_file = os.path.join(log_path, settings.LOG_ERROR_FILENAME)
 
-    # loguru logger: https://loguru.readthedocs.io/en/stable/api/logger.html#loguru._logger.Logger.add
+    # set loguru logger default config
+    # https://loguru.readthedocs.io/en/stable/api/logger.html#loguru._logger.Logger.add
     log_config = {
-        'rotation': '10 MB',
-        'retention': '15 days',
-        'compression': 'tar.gz',
-        'enqueue': True,
         'format': settings.LOG_FILE_FORMAT,
+        'enqueue': True,
+        'rotation': '5 MB',
+        'retention': '7 days',
+        'compression': 'tar.gz',
     }
 
     # stdout file
     logger.add(
-        str(log_stdout_file),
-        level=settings.LOG_STDOUT_LEVEL,
-        **log_config,
+        str(log_access_file),
+        level=settings.LOG_ACCESS_FILE_LEVEL,
+        filter=lambda record: record['level'].no <= 25,
         backtrace=False,
         diagnose=False,
+        **log_config,
     )
 
     # stderr file
     logger.add(
-        str(log_stderr_file),
-        level=settings.LOG_STDERR_LEVEL,
-        **log_config,
+        str(log_error_file),
+        level=settings.LOG_ERROR_FILE_LEVEL,
+        filter=lambda record: record['level'].no >= 30,
         backtrace=True,
         diagnose=True,
+        **log_config,
     )
 
 

backend/core/conf.py

@@ -67,13 +67,13 @@ def validator_api_url(cls, values):
     TOKEN_URL_SWAGGER: str = f'{FASTAPI_API_V1_PATH}/auth/login/swagger'
 
     # Log
-    LOG_ROOT_LEVEL: str = 'NOTSET'
+    LOG_STD_LEVEL: str = 'INFO'
+    LOG_ACCESS_FILE_LEVEL: str = 'INFO'
+    LOG_ERROR_FILE_LEVEL: str = 'ERROR'
     LOG_STD_FORMAT: str = '<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</> | <lvl>{level: <8}</> | <lvl>{message}</>'
     LOG_FILE_FORMAT: str = '<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</> | <lvl>{level: <8}</> | <lvl>{message}</>'
-    LOG_STDOUT_LEVEL: str = 'INFO'
-    LOG_STDERR_LEVEL: str = 'ERROR'
-    LOG_STDOUT_FILENAME: str = 'fba_access.log'
-    LOG_STDERR_FILENAME: str = 'fba_error.log'
+    LOG_ACCESS_FILENAME: str = 'fba_access.log'
+    LOG_ERROR_FILENAME: str = 'fba_error.log'
 
     # 中间件
     MIDDLEWARE_CORS: bool = True

backend/core/registrar.py

@@ -11,7 +11,7 @@
 
 from backend.app.router import route
 from backend.common.exception.exception_handler import register_exception
-from backend.common.log import setup_logging, set_customize_logfile
+from backend.common.log import setup_logging, set_custom_logfile
 from backend.core.conf import settings
 from backend.core.path_conf import STATIC_DIR
 from backend.database.db import mysql_config
@@ -87,7 +87,7 @@ def register_logger() -> None:
     :return:
     """
     setup_logging()
-    set_customize_logfile()
+    set_custom_logfile()
 
 
 def register_static_file(app: FastAPI):