From f9c74a1dda22d52e9e46f704fb81e411692c0b52 Mon Sep 17 00:00:00 2001 From: "mark.tian" Date: Mon, 8 Dec 2025 13:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=A5=E5=BF=97=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/callback_service.py | 4 ++-- app/celery_app.py | 4 ++-- app/celery_tasks.py | 4 ++-- app/database.py | 4 ++-- app/logger.py | 39 +++++++++++++++++++++++++++++++++++++-- app/redis_lock.py | 4 ++-- app/routes.py | 4 ++-- main.py | 4 ++-- 8 files changed, 51 insertions(+), 16 deletions(-) diff --git a/app/callback_service.py b/app/callback_service.py index 8923ab3..cf911ac 100644 --- a/app/callback_service.py +++ b/app/callback_service.py @@ -11,10 +11,10 @@ from sqlalchemy import text from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession from app.config import settings -from app.logger import get_logger +from app.logger import get_callback_service_logger from app.database import CallbackFailureLog -logger = get_logger("callback_service") +logger = get_callback_service_logger() async def log_callback_request( diff --git a/app/celery_app.py b/app/celery_app.py index b705306..cd98ddd 100644 --- a/app/celery_app.py +++ b/app/celery_app.py @@ -3,9 +3,9 @@ Celery应用配置 """ from celery import Celery from app.config import settings -from app.logger import get_logger +from app.logger import get_celery_logger -logger = get_logger("celery") +logger = get_celery_logger() # 创建Celery应用实例 celery_app = Celery( diff --git a/app/celery_tasks.py b/app/celery_tasks.py index 1830bfc..d087c01 100644 --- a/app/celery_tasks.py +++ b/app/celery_tasks.py @@ -6,7 +6,7 @@ from sqlalchemy import create_engine import json from app.celery_app import celery_app from app.config import settings -from app.logger import get_logger +from app.logger import get_celery_tasks_logger from app.callback_service import ( save_callback_data_items, get_uncompleted_callback_log, @@ -16,7 +16,7 @@ from app.callback_service import ( ) from app.redis_lock import redis_manager -logger = get_logger("celery_tasks") +logger = get_celery_tasks_logger() # 创建同步数据库连接用于Celery任务 engine = create_engine( diff --git a/app/database.py b/app/database.py index 72669c5..a376e4c 100644 --- a/app/database.py +++ b/app/database.py @@ -3,10 +3,10 @@ from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sess from sqlalchemy.orm import DeclarativeBase from sqlalchemy import Column, String, Integer, DateTime, Text, JSON, Index, text, Boolean from app.config import settings -from app.logger import get_logger +from app.logger import db_logger from sqlalchemy.sql.expression import func -logger = get_logger("database") +logger = db_logger class Base(DeclarativeBase): diff --git a/app/logger.py b/app/logger.py index 512460d..72d792e 100644 --- a/app/logger.py +++ b/app/logger.py @@ -1,6 +1,5 @@ import logging import logging.handlers -import os from pathlib import Path from typing import Optional @@ -106,4 +105,40 @@ def get_logger(name: Optional[str] = None) -> logging.Logger: app_logger = get_logger("app") api_logger = get_logger("api") db_logger = get_logger("database") -external_api_logger = get_logger("external_api") \ No newline at end of file +external_api_logger = get_logger("external_api") + +# 各模块专用日志器 +main_logger = get_logger("main") +routes_logger = get_logger("routes") +celery_logger = get_logger("celery") +celery_tasks_logger = get_logger("celery_tasks") +callback_service_logger = get_logger("callback_service") +redis_logger = get_logger("redis") + +# 向后兼容的默认日志器 +logger = app_logger + +# 便捷获取各模块日志器的函数 +def get_main_logger(): + """获取main模块日志器""" + return main_logger + +def get_routes_logger(): + """获取routes模块日志器""" + return routes_logger + +def get_celery_logger(): + """获取celery模块日志器""" + return celery_logger + +def get_celery_tasks_logger(): + """获取celery_tasks模块日志器""" + return celery_tasks_logger + +def get_callback_service_logger(): + """获取callback_service模块日志器""" + return callback_service_logger + +def get_redis_logger(): + """获取redis模块日志器""" + return redis_logger \ No newline at end of file diff --git a/app/redis_lock.py b/app/redis_lock.py index 6d4f18b..0deb1d2 100644 --- a/app/redis_lock.py +++ b/app/redis_lock.py @@ -3,9 +3,9 @@ import asyncio import uuid from typing import Optional from app.config import settings -from app.logger import get_logger +from app.logger import get_redis_logger -logger = get_logger("redis") +logger = get_redis_logger() class RedisLock: diff --git a/app/routes.py b/app/routes.py index f846a01..3b67496 100644 --- a/app/routes.py +++ b/app/routes.py @@ -3,10 +3,10 @@ from sqlalchemy.ext.asyncio import AsyncSession from app.database import get_db from app.models import CallbackResponse from app.config import settings -from app.logger import get_logger +from app.logger import get_routes_logger from app.callback_service import log_callback_request -logger = get_logger("routes") +logger = get_routes_logger() router = APIRouter() diff --git a/main.py b/main.py index 6b0def6..61b3a9d 100644 --- a/main.py +++ b/main.py @@ -10,12 +10,12 @@ import os from app.config import settings from app.database import engine from app.routes import router -from app.logger import get_logger, LoggerManager +from app.logger import LoggerManager, get_main_logger # 初始化日志系统 LoggerManager.setup_logging() -logger = get_logger("main") +logger = get_main_logger() # Celery Worker 进程管理 celery_worker_process = None