logging-ext2 0.2.1__tar.gz → 0.2.3__tar.gz

{logging_ext2-0.2.1 → logging_ext2-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: logging-ext2
-Version: 0.2.1
+Version: 0.2.3
 Summary: extend python logging library
 Project-URL: Documentation, https://github.com/ramwin/logging-ext#readme
 Project-URL: Issues, https://github.com/ramwin/logging-ext/issues
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
+Requires-Dist: filelock
 Description-Content-Type: text/markdown
 
 # logging-ext2

{logging_ext2-0.2.1 → logging_ext2-0.2.3}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = []
+dependencies = ["filelock"]
 
 [project.urls]
 Documentation = "https://github.com/ramwin/logging-ext#readme"

{logging_ext2-0.2.1 → logging_ext2-0.2.3}/src/logging_ext2/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Xiang Wang <ramwin@qq.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.1"
+__version__ = "0.2.3"

{logging_ext2-0.2.1 → logging_ext2-0.2.3}/src/logging_ext2/handlers.py

@@ -5,6 +5,9 @@
 
 import datetime
 import subprocess
+import time
+
+from filelock import FileLock
 
 from logging import Handler, NOTSET
 from pathlib import Path
@@ -67,16 +70,24 @@ class TimedRotatingFileHandler(Handler):
         for to_gzip_path in paths[self.flat_keep:self.max_keep]:
             # here use the system gzip command to ignore exceptions like
             # permission denied or file not found
-            if not to_gzip_path.stat().st_size:
-                to_gzip_path.unlink(missing_ok=True)
+            try:
+                if not to_gzip_path.stat().st_size:
+                    to_gzip_path.unlink(missing_ok=True)
+                    continue
+            except FileNotFoundError:
                 continue
             if to_gzip_path.suffix == ".gz":
                 continue
-            self.base_dir.joinpath(self.filename).touch()
-            cmds = ["flock",
-                    "--nonblock",
-                    self.base_dir.joinpath(self.filename),
-                    "--command",
-                    f"gzip {to_gzip_path}"]
-            subprocess.run(cmds)
+            lock_path = self.base_dir.joinpath(self.filename)
+            lock_path.touch()
+            with FileLock(lock_path, timeout=10):
+                target_file = to_gzip_path.parent.joinpath(
+                        to_gzip_path.name + ".gz"
+                )
+                if target_file.exists():
+                    target_file.rename(target_file.parent.joinpath(
+                        target_file.stem + "_" + str(time.time())
+                    ).with_suffix(".gz"))
+                cmds = ["gzip", to_gzip_path]
+                subprocess.run(cmds)
         self.stream = self.init_stream()

{logging_ext2-0.2.1 → logging_ext2-0.2.3}/tests/__init__.py

@@ -15,7 +15,7 @@ class Test(unittest.TestCase):
         handlera = TimedRotatingFileHandler(
             filename="tests/info.log",
             datetime_formatter="%Y-%m-%d_%H:%M:%S",
-            max_keep=5, flat_keep=2)
+            max_keep=20, flat_keep=2)
         loggera.addHandler(logging.StreamHandler())
         loggera.addHandler(handlera)
         loggera.setLevel(logging.INFO)
@@ -25,7 +25,7 @@ class Test(unittest.TestCase):
         loggerb.addHandler(TimedRotatingFileHandler(
             filename="tests/info.log",
             datetime_formatter="%Y-%m-%d_%H:%M:%S",
-            max_keep=5, flat_keep=2))
+            max_keep=20, flat_keep=2))
         loggerb.addHandler(logging.StreamHandler())
         loggerb.setLevel(logging.INFO)