refined logging

Author: ManiMatter

src/jobs/strikes_handler.py

@@ -1,7 +1,6 @@
 import logging
 from src.utils.log_setup import logger
 
-
 class StrikesHandler:
     def __init__(self, job_name, arr, max_strikes):
         self.job_name = job_name
@@ -35,15 +34,20 @@ def log_change(self, recovered, paused, affected_items):
             if strikes == 1:
                 added.append(d_id)
             elif strikes > 1:
-                incremented.append(f"{d_id} ({strikes}x)")
+                incremented.append(f"{d_id} ({strikes}/{self.max_strikes})")
 
         removed = list(affected_items.keys())
         logger.debug(
-            "Strike status changed | Added: %s | Incremented: %s | Recovered: %s | Tracking Paused: %s | Removed: %s",
+            "Strike status changed | %s Added: %s | %s Incremented (strikes): %s | %s Recovered: %s | %s Tracking Paused: %s | %s Removed: %s",
+            len(added) or 0,
             added or "None",
+            len(incremented) or 0,
             incremented or "None",
+            len(recovered) or 0,
             recovered or "None",
+            len(paused) or 0,
             paused or "None",
+            len(removed) or 0,
             removed or "None",
         )
         return added, incremented, recovered, removed, paused

tests/jobs/test_strikes_handler.py

@@ -1,3 +1,4 @@
+import logging
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -94,35 +95,34 @@ def test_apply_strikes_and_filter(
         assert "HASH1" not in result
 
 
-def test_log_change_logs_expected_strike_changes():
+def test_log_change_logs_expected_strike_changes(caplog):
     handler = StrikesHandler(job_name="remove_stalled", arr=MagicMock(), max_strikes=3)
     handler.tracker = MagicMock()
     handler.tracker.defective = {
         "remove_stalled": {
-            "hash_new": {"title": "A", "strikes": 1},  # should show in added
-            "hash_inc": {"title": "B", "strikes": 2},  # should show in incremented
+            "hash_new": {"title": "A", "strikes": 1},   # should show in added
+            "hash_inc": {"title": "B", "strikes": 2},   # should show in incremented
             "hash_paused": {"title": "C", "strikes": 2},  # should show in paused
         }
     }
+
     recovered = ["hash_old"]
     paused = ["hash_paused"]
     affected = {"hash_gone": {"title": "Gone"}}
 
-    with patch("src.jobs.strikes_handler.logger") as mock_logger:
+    with caplog.at_level(logging.DEBUG, logger="src.utils.log_setup"):
         handler.log_change(recovered, paused, affected)
 
-        mock_logger.debug.assert_called_once()
-        args, _ = mock_logger.debug.call_args
-
-        log_msg = args[0]
-        # Check keywords in the message string
-        for keyword in ["Added", "Incremented", "Recovered", "Removed", "Paused"]:
-            assert keyword in log_msg
+    log_messages = "\n".join(record.message for record in caplog.records)
 
-        # Check keys in the entire call arguments (as string)
-        for key in ["hash_new", "hash_inc", "hash_old", "hash_gone", "hash_paused"]:
-            assert key in str(args)
+    # Check category keywords exist
+    for keyword in ["Added", "Incremented", "Recovered", "Removed", "Paused"]:
+        assert keyword in log_messages
 
+    # Check actual IDs exist
+    for key in ["hash_new", "hash_inc", "hash_old", "hash_gone", "hash_paused"]:
+        assert key in log_messages
+    
 
 @pytest.mark.parametrize(
     "max_strikes, initial_strikes, expected_removed_after_two_runs",