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

mdbq/__version__.py

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

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',
@@ -83,10 +85,14 @@ class MyLogger:
         :param metrics_interval: 指标采集间隔(秒)
         :param message_limited: 简化日志内容，避免过长
         """
+        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 = log_file
+        self.log_file = os.path.join(log_path, log_file)
         self.log_format = log_format
         self.max_log_size = max_log_size
         self.backup_count = backup_count
@@ -119,6 +125,8 @@ class MyLogger:
         if self.enable_async:
             self._start_async_logging()
 
+        atexit.register(self.shutdown)
+
     def __enter__(self):
         """上下文管理器入口"""
         return self
@@ -205,11 +213,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 +261,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)
@@ -461,10 +471,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)
@@ -493,34 +536,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()

{mdbq-3.9.5.dist-info → mdbq-3.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 3.9.5
+Version: 3.9.6
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-3.9.5.dist-info → mdbq-3.9.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=6a9QWBZBLdUXab5LGTsteurYczwlY3DSfMu9kjZZUlA,17
+mdbq/__version__.py,sha256=rCARLRw4aYsH5Ac1n95qGJBlNNqAlv-EapPM3bcYkto,17
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/optimize.py,sha256=2oalzD9weZhDclUC22OLxYa8Zj7KnmsGUoUau_Jlyc4,19796
 mdbq/aggregation/query_data.py,sha256=5_OzjGR5Sq00q-EgAYmSE5V9i4Solw9y4hkldl4mvt8,179808
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/config.py,sha256=eaTfrfXQ65xLqjr5I8-HkZd_jEY1JkGinEgv3TSLeoQ,3170
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
-mdbq/log/mlogger.py,sha256=eM_0CYSWZsiwl6jHkm9F7S7pb_V54LdImrC3tOtxojg,19686
+mdbq/log/mylogger.py,sha256=CeQf8RcVITm9bVr-hHYdx6QtIbA--YkmWBAaPcMcXnY,20724
 mdbq/log/spider_logging.py,sha256=-ozWWEGm3HVv604ozs_OOvVwumjokmUPwbaodesUrPY,1664
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/mysql.py,sha256=WFkv2flWuYRJqTzCOvxyiPeJgyJvVQzSG24jH_x5oEg,132390
@@ -23,7 +23,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=Uk8-cOWT0JU1qRyIVqdbYokSLvkDIAfcokmYj1ebw8k,24104
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=OhyEv1VyAKTOHjLDM37iNDQeRg5OnrNoKODoG2VxHes,19806
-mdbq-3.9.5.dist-info/METADATA,sha256=uv8f_2V0nVGSA9GFa39R9Pdg1ZX2O8ACLQnZkjR9T7I,363
-mdbq-3.9.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.9.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.9.5.dist-info/RECORD,,
+mdbq-3.9.6.dist-info/METADATA,sha256=RyMeBh6UL0QDEClon62yAzpowavd-5sUZKjniEex-hs,363
+mdbq-3.9.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.9.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.9.6.dist-info/RECORD,,