Просмотр исходного кода

Merge pull request #964 from Rain1231244/Add(auto_del_log_file)

Add(auto del log file)
huangrunheng 1 год назад
Родитель
Сommit
8db8646bc0
2 измененных файлов с 40 добавлено и 2 удалено
  1. 29 1
      module/logger.py
  2. 11 1
      script.py

+ 29 - 1
module/logger.py

@@ -19,6 +19,28 @@ from rich.style import Style
 from rich.theme import Theme
 from rich.traceback import Traceback
 
+import time
+from pathlib import Path
+
+SECONDS_IN_DAY = 24 * 60 * 60
+
+def cleanup_logs(log_dir: str = "./log", keep_days: int = 7):
+    """删除 log_dir 下所有早于 keep_days 的普通文件"""
+    cutoff_ts = time.time() - keep_days * SECONDS_IN_DAY
+
+    log_path = Path(log_dir)
+    if not log_path.exists():
+        return  # 目录都没有,直接退出
+
+    for p in log_path.iterdir():
+        # 只处理文件;子文件夹一律跳过
+        if p.is_file():
+            try:
+                if p.stat().st_mtime < cutoff_ts:
+                    p.unlink()
+                    logger.info(f"Removed old log finish: {p.name}")
+            except Exception as e:
+                logger.warning(f"Failed to delete {p}: {e}")
 
 def empty_function(*args, **kwargs):
     pass
@@ -98,7 +120,7 @@ class RichFileHandler(RichHandler):
 pyw_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
 
 
-def set_file_logger(name=pyw_name):
+def set_file_logger(name=pyw_name, *, do_cleanup=False):
     if '_' in name:
         name = name.split('_', 1)[0]
     log_file = f'./log/{datetime.date.today()}_{name}.txt'
@@ -133,6 +155,12 @@ def set_file_logger(name=pyw_name):
     logger.addHandler(hdlr)
     logger.log_file = log_file
 
+    # ---------- 可选:清理旧文件 ----------
+    if do_cleanup:
+        cleanup_logs()
+    if do_cleanup:
+        logger.info("Log cleanup finished")   
+
 
 # ======================================================================================================================
 #            Set flutter

+ 11 - 1
script.py

@@ -14,6 +14,8 @@ import inflection
 import asyncio
 import json
 
+from datetime import date
+import threading
 from typing import Callable
 from datetime import datetime, timedelta
 from pathlib import Path
@@ -33,6 +35,8 @@ from module.logger import logger
 from module.exception import *
 from module.server.i18n import I18n
 
+_log_switch_lock = threading.Lock()#线程锁
+
 class Script:
     def __init__(self, config_name: str ='oas') -> None:
         logger.hr('Start', level=0)
@@ -402,10 +406,16 @@ class Script:
         Main loop of scheduler.
         :return:
         """
-        logger.set_file_logger(self.config_name)
+        with _log_switch_lock:
+            logger.set_file_logger(self.config_name, do_cleanup=True)
+        start_day = date.today()
         logger.info(f'Start scheduler loop: {self.config_name}')
 
         while 1:
+            if date.today() > start_day:
+                with _log_switch_lock:
+                    logger.set_file_logger(self.config_name, do_cleanup=True)
+                start_day = date.today()
             # Check update event from GUI
             # if self.stop_event is not None:
             #     if self.stop_event.is_set():