mlog-util 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

mlog_util/__init__.py

@@ -1,3 +1,5 @@
 from .log_manager import LogManager, get_logger
 from .handlers import MultiProcessSafeSizeRotatingHandler, MultiProcessSafeTimeRotatingHandler
 
+__version__ = "0.1.7"
+

mlog_util/handlers.py

@@ -5,6 +5,8 @@ import glob
 import errno
 import logging
 import portalocker
+from pathlib import Path
+import re
 from abc import ABC, abstractmethod
 
 
@@ -234,20 +236,34 @@ class MultiProcessSafeSizeRotatingHandler(MultiProcessSafeRotatingHandlerBase):
 
     def _do_rollover_impl(self):
         # 轮转备份文件
+        log_path = Path(self.filename)
+
+        # 1. 轮转已存在的备份文件 (例如 .3 -> .4, .2 -> .3, .1 -> .2)
+        # 倒序处理，避免覆盖
         for i in range(self.backupCount - 1, 0, -1):
-            sfn = f"{self.filename}.{i}"
-            dfn = f"{self.filename}.{i+1}"
-            if os.path.exists(sfn):
-                if os.path.exists(dfn):
-                    os.remove(dfn)
-                os.rename(sfn, dfn)
-        if os.path.exists(self.filename):
-            dfn = f"{self.filename}.1"
-            if os.path.exists(dfn):
-                os.remove(dfn)
-            os.rename(self.filename, dfn)
-
-        # 重新创建空的日志文件
+            sfn = log_path.with_suffix(f'.log.{i}')
+            dfn = log_path.with_suffix(f'.log.{i+1}')
+
+            if sfn.exists():
+                try:
+                    # 直接尝试重命名，如果目标文件已存在会失败
+                    os.rename(sfn, dfn)
+                except FileExistsError:
+                    # 如果失败，说明目标文件已存在，先删除再重命名
+                    # 这比 "先检查再操作" 更能避免竞态条件
+                    dfn.unlink()  # pathlib 的删除方法
+                    os.rename(sfn, dfn)
+
+        # 2. 将当前日志文件重命名为第一个备份 .1
+        if log_path.exists():
+            dfn = log_path.with_suffix('.log.1')
+            try:
+                os.rename(log_path, dfn)
+            except FileExistsError:
+                dfn.unlink()
+                os.rename(log_path, dfn)
+
+        # 重新创建空的日志文件 占位
         try:
             with open(self.filename, 'w', encoding='utf-8') as f:
                 pass
@@ -268,7 +284,6 @@ class MultiProcessSafeTimeRotatingHandler(MultiProcessSafeRotatingHandlerBase):
         super().__init__(filename, backupCount)
         self.when = when.upper()
         self.interval = max(1, int(interval))  # 至少为 1
-        self.last_rollover = int(time.time())
 
         # 支持的单位映射
         self.when_to_seconds = {
@@ -278,29 +293,90 @@ class MultiProcessSafeTimeRotatingHandler(MultiProcessSafeRotatingHandlerBase):
             'D': 86400,   # 天
         }
 
-    def _should_rollover(self, record) -> bool:
-        now = int(time.time())
-
         if self.when not in self.when_to_seconds:
-            return False
+            raise ValueError(f"Invalid rollover interval specified: {self.when}")
+        
+        # 在初始化时就计算好下一个轮转时间点
+        self.rolloverAt = self._compute_next_rollover_time(int(time.time()))
 
-        seconds_per_unit = self.when_to_seconds[self.when]
-        total_interval_seconds = seconds_per_unit * self.interval
+    def _compute_next_rollover_time(self, current_time):
+        """
+        计算下一个轮转的时间点（时间戳）。
+        这个方法的核心是使用本地时间来计算，确保轮转发生在正确的本地时间。
+        """
+        t = time.localtime(current_time)
+        
+        # 根据轮转单位，找到当前周期的起始时间点
+        if self.when == 'S':
+            current_period_start = time.mktime((t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, t.tm_wday, t.tm_yday, t.tm_isdst))
+        elif self.when == 'M':
+            current_period_start = time.mktime((t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, 0, t.tm_wday, t.tm_yday, t.tm_isdst))
+        elif self.when == 'H':
+            current_period_start = time.mktime((t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, 0, 0, t.tm_wday, t.tm_yday, t.tm_isdst))
+        else:  # 'D' or any other
+            current_period_start = time.mktime((t.tm_year, t.tm_mon, t.tm_mday, 0, 0, 0, t.tm_wday, t.tm_yday, t.tm_isdst))
 
-        # 计算当前属于第几个周期（从 0 开始）
-        current_cycle = now // total_interval_seconds
-        last_cycle = self.last_rollover // total_interval_seconds
+        # 下一个轮转时间点 = 当前周期起始 + N个周期
+        next_rollover_time = current_period_start + (self.interval * self.when_to_seconds[self.when])
 
-        return current_cycle > last_cycle
+        # 如果计算出的时间点已经过了（例如，程序刚好在边界点启动），则再推后一个周期
+        if next_rollover_time <= current_time:
+            next_rollover_time += self.interval * self.when_to_seconds[self.when]
+            
+        return next_rollover_time
+
+    def _should_rollover(self, record) -> bool:
+        """
+        修正3: 判断逻辑改为与下一个轮转时间点比较
+        """
+        # 获取日志记录产生的时间戳
+        record_time = int(record.created)
+        
+        # 如果记录的时间已经超过了我们预定的下一个轮转时间点，则触发轮转
+        return record_time >= self.rolloverAt
 
     def _do_rollover_impl(self):
-        # 按日期重命名，如 log.txt -> log.txt.2025-09-16
+        # 1. 执行轮转：将当前日志文件重命名为带时间戳的文件
         date_str = time.strftime(self._get_rollover_format())
-        dfn = f"{self.filename}.{date_str}"
-        if os.path.exists(self.filename):
-            os.rename(self.filename, dfn)
-        with open(self.filename, 'w'): pass
-        self.last_rollover = int(time.time())
+        log_path = Path(self.filename)
+        dfn = log_path.with_name(f"{log_path.name}.{date_str}")
+
+        if log_path.exists():
+            try:
+                log_path.rename(dfn)
+            except FileExistsError:
+                dfn.unlink()
+                log_path.rename(dfn)
+
+        # 2. 重新创建空的日志文件（使用你指定的方式）
+        try:
+            with open(self.filename, 'w', encoding='utf-8') as f:
+                pass
+        except Exception as e:
+            print(f"Failed to recreate log file {self.filename}: {e}")
+
+        # 3. 更新下一个轮转的时间点（核心逻辑）
+        current_time = int(time.time())
+        self.rolloverAt = self._compute_next_rollover_time(current_time)
+
+        # --- 清理旧备份的逻辑 ---
+        
+        # 4. 查找所有匹配的备份文件
+        backup_pattern = log_path.with_name(f"{log_path.name}.*")
+        backup_files = glob.glob(str(backup_pattern))
+
+        # 5. 如果备份文件数量超过限制，则进行清理
+        if len(backup_files) > self.backupCount:
+            # 6. 按文件名（即时间戳）排序，找出最旧的文件
+            backup_files.sort()
+            
+            # 7. 计算需要删除的文件数量并删除
+            files_to_delete = backup_files[:-self.backupCount]
+            for file_to_delete in files_to_delete:
+                try:
+                    Path(file_to_delete).unlink()
+                except OSError as e:
+                    print(f"Error deleting old log file {file_to_delete}: {e}")
 
     def _get_rollover_format(self):
         """

mlog_util/log_manager.py

@@ -19,7 +19,7 @@ class LogManager:
         log_file: Optional[str] = None,
         add_console: bool = True,
         level: int = logging.INFO,
-        custom_handlers: Optional[List[logging.Handler]] = None,
+        custom_handlers: Optional[logging.Handler] = None,
     ) -> logging.Logger:
         """
         获取或创建一个配置好的 logger。
@@ -69,10 +69,9 @@ class LogManager:
                     "%(asctime)s | %(name)s | %(levelname)-8s | %(message)s",
                     datefmt="%Y-%m-%d %H:%M:%S"
                 )
-                for handler in custom_handlers:
-                    if handler not in logger.handlers:
-                        handler.setFormatter(custom_formatter)
-                        logger.addHandler(handler)
+                if custom_handlers not in logger.handlers:
+                    custom_handlers.setFormatter(custom_formatter)
+                    logger.addHandler(custom_handlers)
 
             return logger
 

{mlog_util-0.1.6.dist-info → mlog_util-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlog-util
-Version: 0.1.6
+Version: 0.1.7
 Summary: Add your description here
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

mlog_util-0.1.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+mlog_util/__init__.py,sha256=jQ2B37jm5GLPH4crurCo32GIcM8iLbJegSRiDOYHTNU,167
+mlog_util/handlers.py,sha256=q5ne-in0jolqufrqerurSri1ynKcwLfUE2alPrYipWo,14303
+mlog_util/log_manager.py,sha256=XhytVOHgL4HmneYdAU7r67avtDtzbirDoHi6BtMEGiw,4046
+mlog_util-0.1.7.dist-info/METADATA,sha256=0kz4Y-igGgO6CoE-rTlNsSMBHngFvJGcztEBtcDSGbo,207
+mlog_util-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mlog_util-0.1.7.dist-info/top_level.txt,sha256=-liqOVoloTs4GLglhy_pzBBpK-ltsV3IZpg0OQsoD_4,10
+mlog_util-0.1.7.dist-info/RECORD,,

mlog_util-0.1.6.dist-info/RECORD

@@ -1,7 +0,0 @@
-mlog_util/__init__.py,sha256=ZzcwRSCJDIHq_enQIRpvl8VRZz7izkL4VsnupRsR3AY,144
-mlog_util/handlers.py,sha256=0EXqAlzxVlcfXEO478EdYJSDdmlZZp5lRame4hEGnmA,10638
-mlog_util/log_manager.py,sha256=xD1_RmN3O9u1nxqhMqKxAhY00x0pBj_jpvxgL4cFZBE,4088
-mlog_util-0.1.6.dist-info/METADATA,sha256=QLY0lX7AHZCfz7VhKFeK9UdurOFg5p5e9mH-ZZvvVTM,207
-mlog_util-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mlog_util-0.1.6.dist-info/top_level.txt,sha256=-liqOVoloTs4GLglhy_pzBBpK-ltsV3IZpg0OQsoD_4,10
-mlog_util-0.1.6.dist-info/RECORD,,