34047007@qq.com
86126ea16f
- A1 业务层统一 async：gencode 表内省改 run_sync 异步（不再阻塞事件循环）、 check_db 改 async_engine、dict_util 启动预热异步载入；psycopg 降为 APScheduler SQLAlchemyJobStore 专用同步孤岛（注释标注） - A2 测试真 PG 化：conftest 弃 SQLite + mock Redis，改连真实 PG16(dpb_test)+ Redis（number_gen advisory lock 路径真被测）；新增 docker/test-compose.yaml 测试依赖栈(postgres:16:5433 + redis:7:6380)；run_ci 前置探测 + 容器兜底， pytest -m pg 10 套正式 tc 全过（真实 PG16 + Redis） - B1 Redis 启动不强依赖：redis_connect 失败降级启动，缓存类回源 DB、存储类 (会话/AI 配置/调度)经 require_redis 守卫返回 503；真机 3 阶段降级测试 PASS=11 FAIL=0（独立 Redis 6390 + 后端 8091，不动共享 dev 服务） - C 扶正 DPB：后端横幅/日志(dpb.log)/README/pyproject/ai_factory agent 名、 前端 package.json/署名注释/链接文案/deploy.sh/docker 注释全部去 fastapiadmin； grep backend/app + frontend/web/src 零残留 - 验证：全量回归 pass=72 fail=0
79 lines
2.5 KiB
Python
79 lines
2.5 KiB
Python
import logging
|
|
import sys
|
|
from contextvars import ContextVar, Token
|
|
|
|
from loguru import logger
|
|
|
|
from app.config.path_conf import LOG_DIR
|
|
from app.config.setting import settings
|
|
|
|
# ── 请求链路 ID（日志追踪） ──
|
|
_correlation_id: ContextVar[str] = ContextVar("correlation_id", default="")
|
|
|
|
|
|
def set_correlation_id(cid: str) -> Token:
|
|
return _correlation_id.set(cid)
|
|
|
|
|
|
def get_correlation_id() -> str:
|
|
return _correlation_id.get()
|
|
|
|
|
|
def reset_correlation_id(token: Token) -> None:
|
|
_correlation_id.reset(token)
|
|
|
|
|
|
def _context_patcher(record):
|
|
cid = get_correlation_id()
|
|
record["extra"]["ctx"] = f" | cid={cid[:8]}" if cid else ""
|
|
|
|
|
|
class InterceptHandler(logging.Handler):
|
|
"""将标准库 logging 重定向到 Loguru"""
|
|
|
|
def emit(self, record: logging.LogRecord) -> None:
|
|
try:
|
|
level = logger.level(record.levelname).name
|
|
except ValueError:
|
|
level = record.levelno
|
|
frame, depth = logging.currentframe(), 2
|
|
while frame and frame.f_code.co_filename == logging.__file__:
|
|
frame = frame.f_back
|
|
depth += 1
|
|
logger.opt(depth=depth, exception=record.exc_info).log(level, "{}", record.getMessage())
|
|
|
|
|
|
def setup_logger() -> None:
|
|
"""配置日志记录器"""
|
|
LOG_DIR.mkdir(parents=True, exist_ok=True)
|
|
logger.remove()
|
|
logger.configure(patcher=_context_patcher)
|
|
|
|
LOG_FMT = "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>{extra[ctx]}"
|
|
logger.add(sys.stdout, format=LOG_FMT, backtrace=True, diagnose=True, catch=True, level=settings.LOGGER_LEVEL)
|
|
logger.add(
|
|
sink=str(LOG_DIR / "dpb.log"),
|
|
format=LOG_FMT,
|
|
level=settings.LOGGER_LEVEL,
|
|
backtrace=True,
|
|
diagnose=True,
|
|
catch=True,
|
|
rotation="00:00",
|
|
retention=30,
|
|
compression="gz",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
logging.basicConfig(handlers=[InterceptHandler()], level=settings.LOGGER_LEVEL, force=True)
|
|
for name in [k for k in logging.root.manager.loggerDict if isinstance(k, str)] + ["uvicorn", "uvicorn.error", "uvicorn.access"]:
|
|
std = logging.getLogger(name)
|
|
std.handlers = [InterceptHandler()]
|
|
std.propagate = False
|
|
|
|
# APScheduler 的 DEBUG 轮询日志干扰太大，只保留 WARNING 以上
|
|
for name in ("apscheduler", "apscheduler.schedulers", "apscheduler.jobstores"):
|
|
logging.getLogger(name).setLevel(logging.WARNING)
|
|
|
|
|
|
setup_logger()
|