threadmill 0.7.2__tar.gz → 0.7.3__tar.gz

{threadmill-0.7.2 → threadmill-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: threadmill
-Version: 0.7.2
+Version: 0.7.3
 Summary: The most reliable backend for Django's task framework.
 Keywords: Django,tasks,worker
 Author-email: Johannes Maron <johannes@maron.family>

{threadmill-0.7.2 → threadmill-0.7.3}/threadmill/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.7.2'
-__version_tuple__ = version_tuple = (0, 7, 2)
+__version__ = version = '0.7.3'
+__version_tuple__ = version_tuple = (0, 7, 3)
 
-__commit_id__ = commit_id = 'g560d3b3b5'
+__commit_id__ = commit_id = 'g0eee0b8b7'

{threadmill-0.7.2 → threadmill-0.7.3}/threadmill/executor.py

@@ -8,6 +8,7 @@ import logging
 import multiprocessing
 import random
 import socket
+import sys
 import threading
 import time
 import typing
@@ -81,10 +82,21 @@ class JsonFormatter(logging.Formatter):
 
 
 logger = multiprocessing.get_logger()
-handler = logging.StreamHandler()
+handler = logging.StreamHandler(sys.stdout)
 handler.setFormatter(JsonFormatter())
-logger.addHandler(handler)
-logger.setLevel(logging.INFO)
+
+
+def configure_logging(formatter: logging.Formatter) -> None:
+    """Route every log record of this process through the threadmill handler."""
+    handler.setFormatter(formatter)
+    for existing_logger in logging.root.manager.loggerDict.values():
+        if isinstance(existing_logger, logging.Logger):
+            existing_logger.handlers.clear()
+            existing_logger.propagate = True
+    root_logger = logging.getLogger()
+    root_logger.handlers.clear()
+    root_logger.addHandler(handler)
+    root_logger.setLevel(logging.INFO)
 
 
 @dataclasses.dataclass(kw_only=True, slots=True)
@@ -138,7 +150,7 @@ class TaskExecutor:
 
     def run(self) -> None:
         """Start consuming tasks until shutdown is requested."""
-        handler.setFormatter(self.log_formatter)
+        configure_logging(self.log_formatter)
         self.worker_processes = [
             self.create_worker_process() for _ in range(self.process_count)
         ]
@@ -213,8 +225,8 @@ class WorkerProcess(multiprocessing.Process):
 
     def run(self) -> None:
         """Start consumer execution inside this process."""
-        handler.setFormatter(self.log_formatter)
         django.setup()
+        configure_logging(self.log_formatter)
         logger.info("Starting worker process %s", self.name)
         self.lock = threading.Lock()
         self.expired = threading.Event()

{threadmill-0.7.2 → threadmill-0.7.3}/threadmill/management/commands/threadmill.py

@@ -88,8 +88,8 @@ class WorkerCommand(DjangoBaseCommand):
         parser.add_argument(
             "--log-format",
             help=(
-                "Logging format string for worker log records, e.g."
-                " '%%(levelname)s %%(message)s'. Defaults to JSON."
+                "Logging format string for all log records of the worker process,"
+                " e.g. '%%(levelname)s %%(message)s'. Defaults to JSON."
             ),
         )