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

mdbq/__version__.py

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

mdbq/log/{mlogger.py → mylogger.py}

@@ -3,10 +3,12 @@ import logging.handlers
 import datetime
 import json
 import os
+import sys
 import time
 import threading
 import queue
 from typing import Optional, Dict, Any, List, Callable, Union
+import atexit
 
 try:
     import psutil
@@ -49,7 +51,7 @@ class MyLogger:
 
     def __init__(
             self,
-            name: str = 'mlogger',
+            name: str = 'mylogger.log',
             logging_mode: str = 'console',  # 'both', 'console', 'file', 'none'
             log_level: str = 'INFO',  # 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'
             log_file: str = 'm_app.log',
@@ -63,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
     ):
         """
         初始化日志记录器
@@ -82,11 +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')
         self.name = name
         self.logging_mode = logging_mode.lower()
         self.log_level = log_level.upper()
-        self.log_file = log_file
+        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
@@ -98,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()
@@ -112,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()
@@ -119,6 +131,8 @@ class MyLogger:
         if self.enable_async:
             self._start_async_logging()
 
+        atexit.register(self.shutdown)
+
     def __enter__(self):
         """上下文管理器入口"""
         return self
@@ -205,11 +219,12 @@ class MyLogger:
                         'timestamp': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
                         'level': record.levelname,
                         'message': record.getMessage(),
-                        'module': record.module,
+                        # 'module': record.module,
                         'function': record.funcName,
-                        'line': record.lineno,
-                        'thread': record.threadName,
-                        'process': record.processName,
+                        # 'line': record.lineno,
+                        # 'thread': record.threadName,
+                        # 'process': record.processName,
+                        'name': record.name,
                     }
 
                     # 添加额外字段
@@ -252,7 +267,8 @@ class MyLogger:
                 filename=self.log_file,
                 maxBytes=self.max_log_size * 1024 * 1024,
                 backupCount=self.backup_count,
-                encoding='utf-8'
+                encoding='utf-8',
+                delay=False
             )
             file_handler.setFormatter(formatter)
             self.logger.addHandler(file_handler)
@@ -429,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):
         """记录调试信息"""
@@ -461,10 +487,43 @@ class MyLogger:
         """记录异常信息"""
         if not extra:
             extra = {}
-        extra['异常'] = str(exc_info)
-        extra['类型'] = exc_info.__class__.__name__
+        # # 获取异常发生的实际位置
+        # tb = exc_info.__traceback__
+        #
+        # if tb:
+        #     extra.update({
+        #         'module': tb.tb_frame.f_globals.get('__name__', ''),
+        #         'function': tb.tb_frame.f_code.co_name,
+        #         'line': tb.tb_lineno,
+        #         'file': tb.tb_frame.f_code.co_filename
+        #     })
+        # extra['异常'] = str(exc_info)
+        # extra['类型'] = exc_info.__class__.__name__
+        # self.log('error', message, extra)
+
+        # 获取完整的异常堆栈
+        tb = exc_info.__traceback__
+        while tb.tb_next:
+            tb = tb.tb_next  # 获取最内层的堆栈帧
+
+        extra.update({
+            'module': tb.tb_frame.f_globals.get('__name__', ''),
+            'function': tb.tb_frame.f_code.co_name,
+            'line': tb.tb_lineno,
+            'file': tb.tb_frame.f_code.co_filename,
+            '异常': str(exc_info),
+            '类型': exc_info.__class__.__name__,
+            '堆栈': self._format_traceback(exc_info)
+        })
+
+        # 直接使用logger的error方法记录，保留原始调用栈
         self.log('error', message, extra)
 
+    def _format_traceback(self, exc_info):
+        """格式化异常堆栈"""
+        import traceback
+        return ''.join(traceback.format_exception(type(exc_info), exc_info, exc_info.__traceback__))
+
     def timeit(self, message: str = "Execution time"):
         """返回一个计时器上下文管理器"""
         return self._Timer(self, message)
@@ -485,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():
     # 创建日志记录器
@@ -493,34 +586,16 @@ def main():
         logging_mode='both',
         log_level='DEBUG',
         log_file='/Users/xigua/Downloads/my_app.log',
-        log_format='simple',
-        enable_async=True,
+        log_format='json',
+        max_log_size=50,
+        backup_count=5,
+        enable_async=True,  # 是否启用异步日志
         sample_rate=1,  # 采样50%的DEBUG/INFO日志
-        sensitive_fields=['password', 'token'],
-        enable_metrics=True
+        sensitive_fields=[],  #  敏感字段列表
+        enable_metrics=False,  # 是否启用性能指标
     )
 
-    # 添加自定义过滤器
-    def keyword_filter(level, message, extra):
-        blocked_keywords = ['secret', 'password']
-        return not any(keyword in message.lower() for keyword in blocked_keywords)
-
-    logger.add_filter(keyword_filter)
-
-    # 使用上下文管理器
-    with logger.context(request_id='12345', user='admin'):
-        logger.info("开始处理请求")
-
-        # 使用计时器
-        with logger.timeit("数据库查询"):
-            time.sleep(0.1)  # 模拟耗时操作
-
-        logger.debug("调试信息", extra={'data': {'key': 'value'}})
-
-        try:
-            1 / 0
-        except Exception as e:
-            logger.exception("发生错误", e)
+    logger.info('123')
 
     # 确保所有日志被刷新
     logger.shutdown()