echoss-common 2.0.0__tar.gz → 2.0.1__tar.gz

{echoss_common-2.0.0/echoss_common.egg-info → echoss_common-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echoss-common
-Version: 2.0.0
+Version: 2.0.1
 Summary: echoss AI Bigdata Center 공통 유틸리티 라이브러리 (Logger, JsonLogDict, config_fileformat)
 License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3

{echoss_common-2.0.0 → echoss_common-2.0.1}/echoss_common/echoss_logger.py

@@ -52,6 +52,23 @@ class JsonLineFormatter(logging.Formatter):
         return json.dumps(payload, ensure_ascii=False, default=str)
 
 
+# Windows cannot rename a file another handle keeps open, so a replaced stream only arises
+# there through copy-truncate, which keeps the inode. Keep the 2.0.0 behaviour on Windows.
+_STALE_STREAM_CHECK = os.name != "nt"
+
+
+# True when another handler already rotated the file this handler is still writing to.
+def _stream_replaced(handler) -> bool:
+    if not _STALE_STREAM_CHECK or handler.stream is None:
+        return False
+    try:
+        mine = os.fstat(handler.stream.fileno())
+        disk = os.stat(handler.baseFilename)
+    except OSError:
+        return False
+    return (mine.st_dev, mine.st_ino) != (disk.st_dev, disk.st_ino)
+
+
 # On Windows, renaming a log file that another handle keeps open fails with PermissionError (WinError 32).
 # Fall back to copy-then-truncate so no record is lost, and always move rolloverAt forward.
 class CopyTruncateRotatingHandler(TimedRotatingFileHandler):
@@ -73,6 +90,12 @@ class CopyTruncateRotatingHandler(TimedRotatingFileHandler):
             f.truncate(0)
 
     def doRollover(self):
+        if _stream_replaced(self):
+            self.stream.close()
+            self.stream = None  # a failed _open() must leave None so the next emit reopens, as the stdlib does
+            self.stream = self._open()
+            self.rolloverAt = self.computeRollover(int(time.time()))
+            return
         super().doRollover()
         now = int(time.time())
         if self.rolloverAt <= now:

{echoss_common-2.0.0 → echoss_common-2.0.1/echoss_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echoss-common
-Version: 2.0.0
+Version: 2.0.1
 Summary: echoss AI Bigdata Center 공통 유틸리티 라이브러리 (Logger, JsonLogDict, config_fileformat)
 License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3

{echoss_common-2.0.0 → echoss_common-2.0.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 # 패키지 메타데이터
 [project]
 name="echoss-common"
-version="2.0.0"
+version="2.0.1"
 description="echoss AI Bigdata Center 공통 유틸리티 라이브러리 (Logger, JsonLogDict, config_fileformat)"
 readme = "README.md"
 license = "Apache-2.0"

{echoss_common-2.0.0 → echoss_common-2.0.1}/tests/test_echoss_logger_2x.py

@@ -164,6 +164,57 @@ def test_existing_dated_file_is_kept_and_rollover_moves_forward(tmp_path):
     assert handler.rolloverAt > now
 
 
+# Two loggers, one handler each, one file, rotating every second: writes A1 B1 | A2 B2 | A3 B3
+def _write_through_two_handlers(tmp_path):
+    log_file = tmp_path / "e.log"
+    loggers = []
+    for name in ("two_a", "two_b"):
+        handler = echoss_logger.CopyTruncateRotatingHandler(str(log_file), when="S", interval=1, encoding="utf-8")
+        handler.setFormatter(logging.Formatter("%(message)s"))
+        logger = logging.getLogger(name)
+        logger.propagate = False
+        logger.setLevel(logging.INFO)
+        logger.addHandler(handler)
+        loggers.append(logger)
+    try:
+        for i in (1, 2, 3):
+            loggers[0].info("A%d", i)
+            loggers[1].info("B%d", i)
+            if i < 3:
+                time.sleep(1.2)
+    finally:
+        for logger in loggers:
+            for handler in list(logger.handlers):
+                logger.removeHandler(handler)
+                handler.close()
+    rotated = sorted(tmp_path.glob("e.log.*"))
+    return log_file.read_text(encoding="utf-8").split(), [p.read_text(encoding="utf-8").split() for p in rotated]
+
+
+# T-M1
+def test_two_handlers_on_one_file_write_current_file_after_rotation(tmp_path):
+    current, rotated = _write_through_two_handlers(tmp_path)
+
+    assert current == ["A3", "B3"]
+    assert rotated == [["A1", "B1"], ["A2", "B2"]]
+
+
+# T-M2
+def test_two_handlers_lose_and_duplicate_no_record(tmp_path):
+    current, rotated = _write_through_two_handlers(tmp_path)
+
+    assert sorted(current + [line for lines in rotated for line in lines]) == ["A1", "A2", "A3", "B1", "B2", "B3"]
+
+
+# T-M3
+def test_stale_stream_check_off_keeps_2_0_0_layout(tmp_path, monkeypatch):
+    monkeypatch.setattr(echoss_logger, "_STALE_STREAM_CHECK", False, raising=False)
+    current, rotated = _write_through_two_handlers(tmp_path)
+
+    assert current == ["A3"]
+    assert rotated == [["A1", "B1", "B2", "B3"], ["A2"]]
+
+
 # T-08
 @pytest.mark.parametrize("func, params", [
     (echoss_common.get_app_logger,