mdbq 3.9.6__py3-none-any.whl → 3.9.7__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.9.6'
+VERSION = '3.9.7'

mdbq/log/mylogger.py

@@ -65,7 +65,8 @@ class MyLogger:
             filters: Optional[List[Callable]] = None,
             enable_metrics: bool = False,
             metrics_interval: int = 300,
-            message_limited: int = 1000
+            message_limited: int = 1000,
+            flush_interval: int = 5
     ):
         """
         初始化日志记录器
@@ -84,15 +85,15 @@ class MyLogger:
         :param enable_metrics: 是否启用系统指标采集
         :param metrics_interval: 指标采集间隔(秒)
         :param message_limited: 简化日志内容，避免过长
+        :param flush_interval: 定时刷新日志器间隔(秒)
         """
         log_path = os.path.join(os.path.expanduser("~"), 'logfile')
-        if not os.path.isdir(log_path):
-            os.makedirs(log_path)
-
         self.name = name
         self.logging_mode = logging_mode.lower()
         self.log_level = log_level.upper()
         self.log_file = os.path.join(log_path, log_file)
+        if not os.path.isdir(os.path.dirname(self.log_file)):
+            os.makedirs(os.path.dirname(self.log_file))
         self.log_format = log_format
         self.max_log_size = max_log_size
         self.backup_count = backup_count
@@ -104,6 +105,7 @@ class MyLogger:
         self.enable_metrics = enable_metrics and HAS_PSUTIL
         self.metrics_interval = metrics_interval
         self.message_limited = message_limited
+        self.flush_interval = flush_interval
 
         # 上下文相关
         self._context = threading.local()
@@ -118,6 +120,10 @@ class MyLogger:
         self._async_thread = None
         self._stop_event = threading.Event()
 
+        # 定时刷新相关
+        self._flush_thread = None
+        self._last_flush_time = 0
+
         # 创建日志记录器
         self.logger = logging.getLogger(name)
         self._init_logging()
@@ -439,13 +445,23 @@ class MyLogger:
         """关闭日志记录器，确保所有日志被刷新"""
         if self.enable_async:
             self._stop_event.set()
+            # 等待队列清空
+            while not self._log_queue.empty():
+                time.sleep(0.1)
             if self._async_thread and self._async_thread.is_alive():
-                self._async_thread.join(timeout=5)
+                self._async_thread.join(timeout=2)
+            if self._flush_thread and self._flush_thread.is_alive():
+                self._flush_thread.join(timeout=2)
 
         # 确保所有handler被刷新
+        self._flush_handlers()
+
+        # 关闭所有handler
         for handler in self.logger.handlers:
-            handler.flush()
-            handler.close()
+            try:
+                handler.close()
+            except:
+                pass
 
     def debug(self, message: str, extra: Optional[Dict] = None):
         """记录调试信息"""
@@ -528,6 +544,40 @@ class MyLogger:
                              extra={'elapsed_seconds': elapsed})
             return False
 
+    def _start_flush_thread(self):
+        """启动定时刷新线程"""
+        self._stop_event.clear()
+        self._flush_thread = threading.Thread(
+            target=self._flush_worker,
+            name=f"{self.name}_flush_thread",
+            daemon=True
+        )
+        self._flush_thread.start()
+
+    def _flush_worker(self):
+        """定时刷新工作线程"""
+        while not self._stop_event.is_set():
+            try:
+                time.sleep(self.flush_interval)
+                self._flush_handlers()
+            except Exception as e:
+                try:
+                    self.logger.error(f"刷新线程异常: {e}",
+                                      extra={'extra_data': {'flush_error': str(e)}})
+                except:
+                    pass
+
+    def _flush_handlers(self):
+        """刷新所有handler"""
+        for handler in self.logger.handlers:
+            try:
+                handler.flush()
+            except Exception as e:
+                try:
+                    self.logger.error(f"刷新handler失败: {e}",
+                                      extra={'extra_data': {'handler_flush_error': str(e)}})
+                except:
+                    pass
 
 def main():
     # 创建日志记录器