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

mlog_util/log_manager.py

@@ -6,87 +6,80 @@ from typing import Type, List, Optional
 # from .handlers import MultiProcessSafeSizeRotatingHandler, MultiProcessSafeTimeRotatingHandler
 
 class LogManager:
-    _logger_cache = {}
-    _lock = threading.Lock()  # 多线程安全
+    """
+    一个线程安全的日志管理器，用于获取和配置具有 Rich 控制台输出的 Logger。
+    """
+    _logger_cache: dict[str, logging.Logger] = {}
+    _lock = threading.Lock()
 
     @classmethod
     def get_logger(
         cls,
         name: str,
-        logger_cls: Type[logging.Logger] = logging.Logger,
-        log_file: str | None = None,
+        log_file: Optional[str] = None,
         add_console: bool = True,
         level: int = logging.INFO,
-        custom_handlers: list[logging.Handler] | None = None,
+        custom_handlers: Optional[List[logging.Handler]] = None,
     ) -> logging.Logger:
         """
-        获取或创建 logger。
+        获取或创建一个配置好的 logger。
+
+        注意：Logger 实例按 name 缓存。重复调用会返回同一个实例，
+        但会确保其配置（如 level 和 handlers）符合当前调用参数。
 
-        :param name: logger 名称
-        :param logger_cls: logger 类
-        :param log_file: 日志文件路径
-        :param add_console: 是否添加控制台 RichHandler
-        :param level: 日志级别
-        :param custom_handlers: 自定义 Handler 列表
+        :param name: logger 名称。
+        :param log_file: 日志文件路径，如果为 None 则不写入文件。
+        :param add_console: 是否添加带 Rich 格式的控制台 Handler。
+        :param level: 日志级别。
+        :param custom_handlers: 自定义 Handler 列表。
         """
-        cache_key = (name, logger_cls)
         with cls._lock:
-            if cache_key not in cls._logger_cache:
-                # 创建 logger
-                if logger_cls == logging.Logger:
-                    logger = logging.getLogger(name)
-                else:
-                    logger = logger_cls(name)
-
-                logger.setLevel(level)
-                logger.propagate = False  # 不向 root logger 冒泡
-
-                # 添加控制台 handler
-                if add_console:
-                    if not any(isinstance(h, RichHandler) for h in logger.handlers):
-                        console_handler = RichHandler(rich_tracebacks=True)
-                        console_formatter = logging.Formatter(
-                            "%(message)s        [%(name)s - %(asctime)s]",
-                            datefmt="%Y-%m-%d %H:%M:%S"
-                        )
-                        console_handler.setFormatter(console_formatter)
-                        logger.addHandler(console_handler)
-
-                # 添加文件 handler
-                if log_file:
-                    if not any(isinstance(h, logging.FileHandler) for h in logger.handlers):
-                        # handler = MultiProcessSafeSizeRotatingHandler(log_file, maxBytes=10*200, backupCount=3)
-                        # file_handler = logging.FileHandler(log_file, encoding="utf-8")
-
-                        handler = logging.FileHandler(log_file, encoding="utf-8")
-                        file_formatter = logging.Formatter(
-                            "%(asctime)s | %(name)s | %(levelname)s | %(message)s",
-                            datefmt="%Y-%m-%d %H:%M:%S"
-                        )
-                        handler.setFormatter(file_formatter)
+            # 1. 获取或创建 Logger 实例 (利用 logging 模块自身的缓存)
+            logger = logging.getLogger(name)
+
+            # 2. 确保基本配置
+            logger.setLevel(level)
+            logger.propagate = False
+
+            # 3. 配置控制台 Handler
+            if add_console and not any(isinstance(h, RichHandler) for h in logger.handlers):
+                console_handler = RichHandler(rich_tracebacks=True, show_time=False, show_path=False)
+                # 注意：RichHandler 默认有自己的时间格式，我们可以在 Formatter 中覆盖
+                console_formatter = logging.Formatter(
+                    "[%(name)s - %(asctime)s]    %(message)s",
+                    datefmt="%Y-%m-%d %H:%M:%S"
+                )
+                console_handler.setFormatter(console_formatter)
+                logger.addHandler(console_handler)
+
+            # 4. 配置文件 Handler
+            if log_file and not any(isinstance(h, logging.FileHandler) for h in logger.handlers):
+                file_handler = logging.FileHandler(log_file, encoding="utf-8")
+                file_formatter = logging.Formatter(
+                    "%(asctime)s | %(name)s | %(levelname)-8s | %(message)s",
+                    datefmt="%Y-%m-%d %H:%M:%S"
+                )
+                file_handler.setFormatter(file_formatter)
+                logger.addHandler(file_handler)
+
+            # 5. 配置自定义 Handlers (修正了原代码的 Bug)
+            if custom_handlers:
+                # 为所有自定义 handlers 设置一个统一的格式
+                custom_formatter = logging.Formatter(
+                    "%(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)
 
-                # 添加自定义 handler
-                if custom_handlers:
-                    h = custom_handlers
-                    if h not in logger.handlers:
-                        file_formatter = logging.Formatter(
-                            "%(asctime)s | %(name)s | %(levelname)s | %(message)s",
-                            datefmt="%Y-%m-%d %H:%M:%S"
-                        )
-                        h.setFormatter(file_formatter)
-                        logger.addHandler(h)
-                        logger.addHandler(h)
-
-                cls._logger_cache[cache_key] = logger
-
-            return cls._logger_cache[cache_key]
+            return logger
 
 
 # 全局可用的 get_logger 函数（无需引用 LogManager）
 def get_logger(
     name: str=None,
-    logger_cls: Type[logging.Logger] = logging.Logger,
     log_file: Optional[str] = None,
     add_console: bool = True,
     level: int = logging.INFO,
@@ -105,7 +98,6 @@ def get_logger(
 
     return LogManager.get_logger(
         name=name,
-        logger_cls=logger_cls,
         log_file=log_file,
         add_console=add_console,
         level=level,

mlog_util-0.1.6.dist-info/METADATA

@@ -0,0 +1,8 @@
+Metadata-Version: 2.4
+Name: mlog-util
+Version: 0.1.6
+Summary: Add your description here
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Requires-Dist: rich>=14.2.0
+Requires-Dist: portalocker

mlog_util-0.1.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+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,,

mlog_util-0.1.3.dist-info/METADATA

@@ -1,14 +0,0 @@
-Metadata-Version: 2.4
-Name: mlog_util
-Version: 0.1.3
-Summary: 自用日志库
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Requires-Dist: rich
-Requires-Dist: portalocker
-Dynamic: classifier
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary

mlog_util-0.1.3.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=r4701jnTosT78lOVJzKnHGnqKnb5D3Yxq0VoN1oF2TI,4276
-mlog_util-0.1.3.dist-info/METADATA,sha256=4qRMzTajA6aXuChtgqEC9Z3X24zd6Ysxxt4XZBoZcMk,379
-mlog_util-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mlog_util-0.1.3.dist-info/top_level.txt,sha256=-liqOVoloTs4GLglhy_pzBBpK-ltsV3IZpg0OQsoD_4,10
-mlog_util-0.1.3.dist-info/RECORD,,