Merge branch 'main' of https://gitee.com/wg123/video-gen

video-gen-api/app/tasks/pre_test_result_task.py

@@ -1,7 +1,5 @@
 from datetime import datetime, timezone
 import asyncio
-import os
-import logging
 import json
 
 from sqlalchemy import select, update
@@ -11,38 +9,9 @@ from app.models.base import async_session
 from app.models.resources_material import ResourcesMaterial
 from app.models.user_oauth import UserOAuth
 from app.utils.douyinApi import DouyinApi
+from app.utils.logger import get_logger
 
-LOG_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "logs")
-os.makedirs(LOG_DIR, exist_ok=True)
-
-#前测结果和上传素材属于一种任务，放到一起日志里边
-logger = logging.getLogger("upload_queue")
-logger.setLevel(logging.INFO)
-
-
-class DailyRotatingFileHandler(logging.FileHandler):
-    def __init__(self, directory, encoding=None):
-        self.directory = directory
-        filename = self._get_log_filename()
-        super().__init__(filename, encoding=encoding)
-    
-    def _get_log_filename(self):
-        return os.path.join(self.directory, f"pre_test_result_task-{datetime.now(timezone.utc).strftime('%Y-%m-%d')}.log")
-    
-    def emit(self, record):
-        current_filename = self._get_log_filename()
-        if self.baseFilename != current_filename:
-            self.close()
-            self.baseFilename = current_filename
-            self.stream = self._open()
-        super().emit(record)
-
-
-if not logger.handlers:
-    handler = DailyRotatingFileHandler(LOG_DIR, encoding="utf-8")
-    handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s", "%Y-%m-%d %H:%M:%S"))
-    logger.addHandler(handler)
-
+logger = get_logger("pre_test_result_task", "pre_test_result_task")
 douyin_api = DouyinApi()
 
 #获取前测结果并更新数据库，计划任务，每2分钟执行一次

video-gen-api/app/tasks/token_refresh_task.py

@@ -2,9 +2,6 @@ from datetime import datetime, timedelta, timezone
 import asyncio
 import httpx
 import json
-import os
-import logging
-from logging.handlers import TimedRotatingFileHandler
 
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -14,37 +11,10 @@ from app.models.user_oauth_app import UserOAuthApp
 from app.models.base import async_session
 from app.config import settings
 from app.utils.redis import get_redis
+from app.utils.logger import get_logger
 
 REDIS_KEY = "douyin:tokens"
-
-LOG_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "logs")
-
-os.makedirs(LOG_DIR, exist_ok=True)
-
-logger = logging.getLogger("token_refresh")
-logger.setLevel(logging.INFO)
-
-def get_log_filename():
-    return os.path.join(LOG_DIR, f"token_refresh-{datetime.now().strftime('%Y-%m-%d')}.log")
-
-class DailyRotatingFileHandler(logging.FileHandler):
-    def __init__(self, directory, encoding=None):
-        self.directory = directory
-        filename = get_log_filename()
-        super().__init__(filename, encoding=encoding)
-    
-    def emit(self, record):
-        current_filename = get_log_filename()
-        if self.baseFilename != current_filename:
-            self.close()
-            self.baseFilename = current_filename
-            self.stream = self._open()
-        super().emit(record)
-
-handler = DailyRotatingFileHandler(LOG_DIR, encoding="utf-8")
-handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s", "%Y-%m-%d %H:%M:%S"))
-
-logger.addHandler(handler)
+logger = get_logger("token_refresh", "token_refresh")