Explorar o código

Make sure multiprocessing logger is set up

Ask Solem %!s(int64=14) %!d(string=hai) anos
pai
achega
ea69e31603
Modificáronse 1 ficheiros con 6 adicións e 5 borrados
  1. 6 5
      celery/log.py

+ 6 - 5
celery/log.py

@@ -7,6 +7,7 @@ import sys
 import traceback
 import traceback
 
 
 from multiprocessing import current_process
 from multiprocessing import current_process
+from multiprocessing import util as mputil
 
 
 from celery import conf
 from celery import conf
 from celery import signals
 from celery import signals
@@ -62,10 +63,8 @@ def setup_logging_subsystem(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
     if not _setup:
     if not _setup:
         ensure_process_aware_logger()
         ensure_process_aware_logger()
         logging.Logger.manager.loggerDict.clear()
         logging.Logger.manager.loggerDict.clear()
-        from multiprocessing import util as mputil
         try:
         try:
-            if mputil._logger is not None:
-                mputil.logger = None
+            mputil._logger = None
         except AttributeError:
         except AttributeError:
             pass
             pass
         receivers = signals.setup_logging.send(sender=None,
         receivers = signals.setup_logging.send(sender=None,
@@ -75,8 +74,10 @@ def setup_logging_subsystem(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
                                                colorize=colorize)
                                                colorize=colorize)
         if not receivers:
         if not receivers:
             root = logging.getLogger()
             root = logging.getLogger()
-            _setup_logger(root, logfile, format, colorize, **kwargs)
-            root.setLevel(loglevel)
+            mp = mputil.get_logger()
+            for logger in (root, mp):
+                _setup_logger(logger, logfile, format, colorize, **kwargs)
+                logger.setLevel(loglevel)
         _setup = True
         _setup = True
         return receivers
         return receivers