init

backend/api/core/Exceptions.py

@@ -1,21 +1,12 @@
-from datetime import datetime
-import logging
-import traceback
-from fastapi import Request, status
-from fastapi.responses import JSONResponse
-# from fastapi import Request, status
-
-from api.core.exception import ResponseException
-
-logFormatter = logging.Formatter(
-    """
-[start]
-%(asctime)s
-<%(name)s>
-%(message)s
-[end]
-"""
-)
+import logging
+import traceback
+from fastapi import Request, status
+from fastapi.responses import JSONResponse
+# from fastapi import Request, status
+
+from api.core.exception import ResponseException
+
+logger = logging.getLogger('dcalc.exception')
 
 
 def format_exception() -> str:
@@ -30,34 +21,12 @@ async def all_exception_handler(request: Request, ex: Exception):
     info = ''
     if not isinstance(ex, ResponseException):
         info = format_exception()
-        if request.client.host != '127.0.0.1':
-            from fastapi.logger import logger
-            logger.setLevel(logging.ERROR)
-            logger.name = 'dcalc'
-            log_directory = 'logs'
-            import os
-
-            if not os.path.exists('./logs'):
-                os.makedirs('./logs')
-            time_str = datetime.now().strftime('%Y_%m_%d')
-            fileHandler = logging.FileHandler(f'{log_directory}/{logger.name}_{time_str}.log', encoding='utf-8')
-            fileHandler.setFormatter(logFormatter)
-            fileHandler.setLevel(logging.ERROR)
-            logger.addHandler(fileHandler)
-            try:
-                import pathlib
-                pathlib.Path(log_directory).mkdir(parents=True, exist_ok=True)
-            except PermissionError:
-                print('创建日志目录logs失败，请确认是否限制了基础的运行权限')
-            logFunc = logger.error
-            try:
-                logFunc(info)
-                info = '服务器内部错误'
-            finally:
-                logger.removeHandler(fileHandler)
-                fileHandler.close()
-    else:
-        info = ex.args[0]
+        client_host = request.client.host if request.client else ''
+        if client_host != '127.0.0.1':
+            logger.error('Unhandled exception for %s', request.url.path, exc_info=(type(ex), ex, ex.__traceback__))
+            info = '服务器内部错误'
+    else:
+        info = ex.args[0]
     # traceback.print_last(sys.exc_info())
     return JSONResponse(
         status_code=status.HTTP_200_OK,

backend/api/core/Logging.py

@@ -0,0 +1,36 @@
+from datetime import datetime
+import logging
+from pathlib import Path
+
+from config.main import BACKEND_DIR
+
+
+LOG_DIR = BACKEND_DIR / 'logs'
+
+
+def configure_logging() -> None:
+    LOG_DIR.mkdir(parents=True, exist_ok=True)
+    log_path = LOG_DIR / f'dcalc_{datetime.now().strftime("%Y_%m_%d")}.log'
+
+    logger = logging.getLogger('dcalc')
+    logger.setLevel(logging.INFO)
+    logger.propagate = True
+
+    if any(isinstance(handler, logging.FileHandler) and Path(handler.baseFilename) == log_path for handler in logger.handlers):
+        return
+
+    handler = logging.FileHandler(log_path, encoding='utf-8')
+    handler.setLevel(logging.ERROR)
+    handler.setFormatter(
+        logging.Formatter(
+            """
+[start]
+%(asctime)s
+<%(name)s>
+%(levelname)s
+%(message)s
+[end]
+"""
+        )
+    )
+    logger.addHandler(handler)

backend/api/core/RedisPreheat.py

@@ -8,7 +8,12 @@ import redis
 
 from api.core.Gzip import gzip_zip
 from api.utils.skill_detail import SKILL_DETAIL_NORMALIZE_VERSION, normalize_skill_detail
-from api.utils.openapi_data import logical_skill_detail_prefix
+from api.utils.openapi_data import (
+    OPENAPI_CUSTOM_CN_PATH,
+    OPENAPI_DATA_DIR,
+    OPENAPI_SKILLS_PATH,
+    logical_skill_detail_prefix,
+)
 from api.utils.skill_tree import (
     SKILL_TREE_NAME_MAP_VERSION,
     SKILL_TREE_WITH_DESC_SPECIAL_VERSION,
@@ -18,7 +23,7 @@ from api.utils.skill_tree import (
 from core.basic.character import createCharacter
 from core.basic.equipment import get_equipment
 from core.character.adventure import adv, get_adv_list
-from database.connect import BACKEND_DIR, RedisPool
+from database.connect import RedisPool
 
 
 PreheatLoader = Callable[[], object]
@@ -28,12 +33,12 @@ PREHEAT_LOCK_EXPIRE_SECONDS = 15 * 60
 
 
 def _load_skills():
-    with (BACKEND_DIR / 'openapi' / 'data' / 'skills.json').open(encoding='utf-8') as file:
+    with OPENAPI_SKILLS_PATH.open(encoding='utf-8') as file:
         return json.load(file)
 
 
 def _load_custom_cn():
-    with (BACKEND_DIR / 'openapi' / 'custom_cn.json').open(encoding='utf-8') as file:
+    with OPENAPI_CUSTOM_CN_PATH.open(encoding='utf-8') as file:
         return json.load(file)
 
 
@@ -60,8 +65,7 @@ def _build_character_preheat_tasks(equ_version: str = '0') -> list[PreheatTask]:
 
 
 def _iter_skill_detail_files() -> list[Path]:
-    data_dir = BACKEND_DIR / 'openapi' / 'data'
-    return sorted(data_dir.glob('cn/*/*/skillDetail/*.json'))
+    return sorted(OPENAPI_DATA_DIR.glob('cn/*/*/skillDetail/*.json'))
 
 
 def _skill_prefix_from_path(path: Path) -> str:
@@ -144,9 +148,8 @@ def _build_skill_data_preheat_tasks(custom_cn: list[dict]) -> list[PreheatTask]:
 
 def _build_skill_tree_preheat_tasks() -> list[PreheatTask]:
     tasks: list[PreheatTask] = []
-    data_dir = BACKEND_DIR / 'openapi' / 'data'
-    for path in sorted(data_dir.glob('cn/*/*/skill_tree.json')):
-        relative = path.relative_to(data_dir)
+    for path in sorted(OPENAPI_DATA_DIR.glob('cn/*/*/skill_tree.json')):
+        relative = path.relative_to(OPENAPI_DATA_DIR)
         job_id = relative.parts[1]
         job_grow_id = relative.parts[2]
         tasks.append(