fix(log): fix typing & exception logs
This commit is contained in:
19
app/log.py
19
app/log.py
@@ -138,27 +138,27 @@ def get_caller_class_name(module_prefix: str = "", just_last_part: bool = True)
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def service_logger(name: str) -> Logger:
|
def service_logger(name: str) -> "Logger":
|
||||||
return logger.bind(service=name)
|
return logger.bind(service=name)
|
||||||
|
|
||||||
|
|
||||||
def fetcher_logger(name: str) -> Logger:
|
def fetcher_logger(name: str) -> "Logger":
|
||||||
return logger.bind(fetcher=name)
|
return logger.bind(fetcher=name)
|
||||||
|
|
||||||
|
|
||||||
def task_logger(name: str) -> Logger:
|
def task_logger(name: str) -> "Logger":
|
||||||
return logger.bind(task=name)
|
return logger.bind(task=name)
|
||||||
|
|
||||||
|
|
||||||
def system_logger(name: str) -> Logger:
|
def system_logger(name: str) -> "Logger":
|
||||||
return logger.bind(system=name)
|
return logger.bind(system=name)
|
||||||
|
|
||||||
|
|
||||||
def uvicorn_logger() -> Logger:
|
def uvicorn_logger() -> "Logger":
|
||||||
return logger.bind(uvicorn="Uvicorn")
|
return logger.bind(uvicorn="Uvicorn")
|
||||||
|
|
||||||
|
|
||||||
def log(name: str) -> Logger:
|
def log(name: str) -> "Logger":
|
||||||
return logger.bind(real_name=name)
|
return logger.bind(real_name=name)
|
||||||
|
|
||||||
|
|
||||||
@@ -196,9 +196,10 @@ def dynamic_format(record):
|
|||||||
real_name = record["extra"].get("real_name", "") or record["name"]
|
real_name = record["extra"].get("real_name", "") or record["name"]
|
||||||
name = f"<fg #FFC1C1>{real_name}</fg #FFC1C1>"
|
name = f"<fg #FFC1C1>{real_name}</fg #FFC1C1>"
|
||||||
|
|
||||||
return (
|
format = f"<green>{{time:YYYY-MM-DD HH:mm:ss}}</green> [<level>{{level}}</level>] | {name} | {{message}}\n"
|
||||||
f"<green>{{time:YYYY-MM-DD HH:mm:ss}}</green> [<level>{{level}}</level>] | {name} | {{message}}{{exception}}\n"
|
if record["exception"]:
|
||||||
)
|
format += "{exception}\n"
|
||||||
|
return format
|
||||||
|
|
||||||
|
|
||||||
logger.remove()
|
logger.remove()
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ async def redirect(request: Request):
|
|||||||
redirect_url = urllib.parse.urljoin(str(settings.frontend_url), target_path)
|
redirect_url = urllib.parse.urljoin(str(settings.frontend_url), target_path)
|
||||||
if query_string:
|
if query_string:
|
||||||
redirect_url = f"{redirect_url}?{query_string}"
|
redirect_url = f"{redirect_url}?{query_string}"
|
||||||
|
|
||||||
return RedirectResponse(
|
return RedirectResponse(
|
||||||
redirect_url,
|
redirect_url,
|
||||||
status_code=301,
|
status_code=301,
|
||||||
|
|||||||
4
main.py
4
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.database import Database, engine, get_redis, redis_client
|
||||||
from app.dependencies.fetcher import get_fetcher
|
from app.dependencies.fetcher import get_fetcher
|
||||||
from app.dependencies.scheduler import start_scheduler, stop_scheduler
|
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.middleware.verify_session import VerifySessionMiddleware
|
||||||
from app.models.mods import init_mods, init_ranked_mods
|
from app.models.mods import init_mods, init_ranked_mods
|
||||||
from app.router import (
|
from app.router import (
|
||||||
@@ -71,7 +71,7 @@ async def lifespan(app: FastAPI): # noqa: ARG001
|
|||||||
|
|
||||||
# 显示资源代理状态
|
# 显示资源代理状态
|
||||||
if settings.enable_asset_proxy:
|
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
|
# on shutdown
|
||||||
yield
|
yield
|
||||||
|
|||||||
Reference in New Issue
Block a user