From 2bfde24b8406a6cdc746c51d4d2af3cece46b4f5 Mon Sep 17 00:00:00 2001
From: MingxuanGame <MingxuanGame@outlook.com>
Date: Fri, 3 Oct 2025 17:27:47 +0000
Subject: [PATCH] fix(log): fix typing & exception logs

---
 app/log.py             | 19 ++++++++++---------
 app/router/redirect.py |  1 -
 main.py                |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/log.py b/app/log.py
index 981c154..5fad3e9 100644
--- a/app/log.py
+++ b/app/log.py
@@ -138,27 +138,27 @@ def get_caller_class_name(module_prefix: str = "", just_last_part: bool = True)
     return None
 
 
-def service_logger(name: str) -> Logger:
+def service_logger(name: str) -> "Logger":
     return logger.bind(service=name)
 
 
-def fetcher_logger(name: str) -> Logger:
+def fetcher_logger(name: str) -> "Logger":
     return logger.bind(fetcher=name)
 
 
-def task_logger(name: str) -> Logger:
+def task_logger(name: str) -> "Logger":
     return logger.bind(task=name)
 
 
-def system_logger(name: str) -> Logger:
+def system_logger(name: str) -> "Logger":
     return logger.bind(system=name)
 
 
-def uvicorn_logger() -> Logger:
+def uvicorn_logger() -> "Logger":
     return logger.bind(uvicorn="Uvicorn")
 
 
-def log(name: str) -> Logger:
+def log(name: str) -> "Logger":
     return logger.bind(real_name=name)
 
 
@@ -196,9 +196,10 @@ def dynamic_format(record):
         real_name = record["extra"].get("real_name", "") or record["name"]
         name = f"<fg #FFC1C1>{real_name}</fg #FFC1C1>"
 
-    return (
-        f"<green>{{time:YYYY-MM-DD HH:mm:ss}}</green> [<level>{{level}}</level>] | {name} | {{message}}{{exception}}\n"
-    )
+    format = f"<green>{{time:YYYY-MM-DD HH:mm:ss}}</green> [<level>{{level}}</level>] | {name} | {{message}}\n"
+    if record["exception"]:
+        format += "{exception}\n"
+    return format
 
 
 logger.remove()
diff --git a/app/router/redirect.py b/app/router/redirect.py
index f90a5d4..a236407 100644
--- a/app/router/redirect.py
+++ b/app/router/redirect.py
@@ -25,7 +25,6 @@ async def redirect(request: Request):
     redirect_url = urllib.parse.urljoin(str(settings.frontend_url), target_path)
     if query_string:
         redirect_url = f"{redirect_url}?{query_string}"
-
     return RedirectResponse(
         redirect_url,
         status_code=301,
diff --git a/main.py b/main.py
index f9f8af7..6646afb 100644
--- a/main.py
+++ b/main.py
@@ -7,7 +7,7 @@ from app.database import User
 from app.dependencies.database import Database, engine, get_redis, redis_client
 from app.dependencies.fetcher import get_fetcher
 from app.dependencies.scheduler import start_scheduler, stop_scheduler
-from app.log import logger, system_logger
+from app.log import system_logger
 from app.middleware.verify_session import VerifySessionMiddleware
 from app.models.mods import init_mods, init_ranked_mods
 from app.router import (
@@ -71,7 +71,7 @@ async def lifespan(app: FastAPI):  # noqa: ARG001
 
     # 显示资源代理状态
     if settings.enable_asset_proxy:
-        logger.info(f"Asset Proxy enabled - Domain: {settings.custom_asset_domain}")
+        system_logger("AssetProxy").info(f"Asset Proxy enabled - Domain: {settings.custom_asset_domain}")
 
     # on shutdown
     yield