mlog-util 0.1.3__tar.gz → 0.1.5__tar.gz

mlog_util-0.1.5/PKG-INFO

@@ -0,0 +1,8 @@
+Metadata-Version: 2.4
+Name: mlog-util
+Version: 0.1.5
+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.5/pyproject.toml

@@ -0,0 +1,16 @@
+[project]
+name = "mlog-util"
+version = "0.1.5"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "rich>=14.2.0",
+    "portalocker"
+]
+
+[dependency-groups]
+dev = [
+    "setuptools>=80.9.0",
+    "twine>=6.2.0",
+]

mlog_util-0.1.5/src/mlog-util/log_manager.py

@@ -0,0 +1,108 @@
+import logging
+import threading
+from rich.logging import RichHandler
+from typing import Type, List, Optional
+
+# from .handlers import MultiProcessSafeSizeRotatingHandler, MultiProcessSafeTimeRotatingHandler
+
+class LogManager:
+    """
+    一个线程安全的日志管理器，用于获取和配置具有 Rich 控制台输出的 Logger。
+    """
+    _logger_cache: dict[str, logging.Logger] = {}
+    _lock = threading.Lock()
+
+    @classmethod
+    def get_logger(
+        cls,
+        name: str,
+        log_file: Optional[str] = None,
+        add_console: bool = True,
+        level: int = logging.INFO,
+        custom_handlers: Optional[List[logging.Handler]] = None,
+    ) -> logging.Logger:
+        """
+        获取或创建一个配置好的 logger。
+
+        注意：Logger 实例按 name 缓存。重复调用会返回同一个实例，
+        但会确保其配置（如 level 和 handlers）符合当前调用参数。
+
+        :param name: logger 名称。
+        :param log_file: 日志文件路径，如果为 None 则不写入文件。
+        :param add_console: 是否添加带 Rich 格式的控制台 Handler。
+        :param level: 日志级别。
+        :param custom_handlers: 自定义 Handler 列表。
+        """
+        with cls._lock:
+            # 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)
+
+            return logger
+
+
+# 全局可用的 get_logger 函数（无需引用 LogManager）
+def get_logger(
+    name: str=None,
+    log_file: Optional[str] = None,
+    add_console: bool = True,
+    level: int = logging.INFO,
+    custom_handlers: Optional[List[logging.Handler]] = None,
+):
+    """
+    便捷函数：获取日志记录器，无需关心 LogManager 实例化。
+    
+    使用示例：
+        from log_manager import get_logger
+        logger = get_logger("my_module", log_file="app.log")
+        logger.info("Hello world")
+    """
+    if name is None:
+        name = "tmp_log"
+
+    return LogManager.get_logger(
+        name=name,
+        log_file=log_file,
+        add_console=add_console,
+        level=level,
+        custom_handlers=custom_handlers
+    )
+
+# logger = LogManager().get_logger("tmp_log")
+

mlog_util-0.1.5/src/mlog_util.egg-info/PKG-INFO

@@ -0,0 +1,8 @@
+Metadata-Version: 2.4
+Name: mlog-util
+Version: 0.1.5
+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.5/src/mlog_util.egg-info/SOURCES.txt

@@ -0,0 +1,10 @@
+pyproject.toml
+src/mlog-util/__init__.py
+src/mlog-util/handlers.py
+src/mlog-util/log_manager.py
+src/mlog_util.egg-info/PKG-INFO
+src/mlog_util.egg-info/SOURCES.txt
+src/mlog_util.egg-info/dependency_links.txt
+src/mlog_util.egg-info/requires.txt
+src/mlog_util.egg-info/top_level.txt
+tests/test_mlog.py

mlog_util-0.1.5/src/mlog_util.egg-info/requires.txt

@@ -0,0 +1,2 @@
+rich>=14.2.0
+portalocker

mlog_util-0.1.5/src/mlog_util.egg-info/top_level.txt

@@ -0,0 +1 @@
+mlog-util

mlog_util-0.1.5/tests/test_mlog.py

@@ -0,0 +1,37 @@
+import time
+import os
+import mlog
+from mlog import LogManager
+from multiprocessing import Pool
+
+log_file = "logs/a1.log"
+
+log_manager = LogManager()
+logger_a1 = log_manager.get_logger("a1", log_file=log_file, add_console=False)
+# logger_a2 = log_manager.get_logger("a2", log_file=log_file, add_console=False)
+# logger_a3 = log_manager.get_logger("a3", log_file=log_file, add_console=False)
+
+
+# 测试 num 个 日志耗时
+def test_speed_time(num = 500):
+    import time
+    _st = time.time()
+    for i in range(num):
+        logger_a1.info(i)
+    logger_a1.info(f"{num} --- {time.time() - _st}")
+
+# 测试多进程
+# 1000 个日志有没有
+def test_logger(x):
+    _pid = os.getpid()
+    logger_a1.info(f"{_pid} -- {x}")
+
+
+if __name__ == "__main__":
+    with open(log_file, "w") as f:
+        pass
+    with Pool(2) as pool:
+        pool.map(test_logger, range(0, 5000))
+
+
+

mlog_util-0.1.3/PKG-INFO

@@ -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/mlog_util/log_manager.py

@@ -1,116 +0,0 @@
-import logging
-import threading
-from rich.logging import RichHandler
-from typing import Type, List, Optional
-
-# from .handlers import MultiProcessSafeSizeRotatingHandler, MultiProcessSafeTimeRotatingHandler
-
-class LogManager:
-    _logger_cache = {}
-    _lock = threading.Lock()  # 多线程安全
-
-    @classmethod
-    def get_logger(
-        cls,
-        name: str,
-        logger_cls: Type[logging.Logger] = logging.Logger,
-        log_file: str | None = None,
-        add_console: bool = True,
-        level: int = logging.INFO,
-        custom_handlers: list[logging.Handler] | None = None,
-    ) -> logging.Logger:
-        """
-        获取或创建 logger。
-
-        :param name: logger 名称
-        :param logger_cls: logger 类
-        :param log_file: 日志文件路径
-        :param add_console: 是否添加控制台 RichHandler
-        :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)
-                        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]
-
-
-# 全局可用的 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,
-    custom_handlers: Optional[List[logging.Handler]] = None,
-):
-    """
-    便捷函数：获取日志记录器，无需关心 LogManager 实例化。
-    
-    使用示例：
-        from log_manager import get_logger
-        logger = get_logger("my_module", log_file="app.log")
-        logger.info("Hello world")
-    """
-    if name is None:
-        name = "tmp_log"
-
-    return LogManager.get_logger(
-        name=name,
-        logger_cls=logger_cls,
-        log_file=log_file,
-        add_console=add_console,
-        level=level,
-        custom_handlers=custom_handlers
-    )
-
-# logger = LogManager().get_logger("tmp_log")
-

mlog_util-0.1.3/mlog_util.egg-info/PKG-INFO

@@ -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/mlog_util.egg-info/SOURCES.txt

@@ -1,9 +0,0 @@
-setup.py
-mlog_util/__init__.py
-mlog_util/handlers.py
-mlog_util/log_manager.py
-mlog_util.egg-info/PKG-INFO
-mlog_util.egg-info/SOURCES.txt
-mlog_util.egg-info/dependency_links.txt
-mlog_util.egg-info/requires.txt
-mlog_util.egg-info/top_level.txt

mlog_util-0.1.3/mlog_util.egg-info/requires.txt

@@ -1,2 +0,0 @@
-rich
-portalocker

mlog_util-0.1.3/mlog_util.egg-info/top_level.txt

@@ -1 +0,0 @@
-mlog_util

mlog_util-0.1.3/setup.py

@@ -1,20 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name="mlog_util",
-    version="0.1.3",
-    packages=find_packages(),
-    install_requires=["rich", "portalocker"],  # 依赖库
-    # author="may",
-    # author_email="no",
-    description="自用日志库",
-    # long_description=open("README.md", encoding="utf-8").read(),
-    # long_description_content_type="text/markdown",
-
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.6',
-)