Removes celery.utils.log.ensure_process_aware_logger

celery/app/log.py

@@ -27,8 +27,7 @@ from celery.five import class_property, string_t
 from celery.utils import isatty, node_format
 from celery.utils.log import (
     get_logger, mlevel,
-    ColorFormatter, ensure_process_aware_logger,
-    LoggingProxy, get_multiprocessing_logger,
+    ColorFormatter, LoggingProxy, get_multiprocessing_logger,
     reset_multiprocessing_logger,
 )
 from celery.utils.term import colored
@@ -98,7 +97,6 @@ class Logging(object):
         format = format or self.format
         colorize = self.supports_color(colorize, logfile)
         reset_multiprocessing_logger()
-        ensure_process_aware_logger()
         receivers = signals.setup_logging.send(
             sender=None, loglevel=loglevel, logfile=logfile,
             format=format, colorize=colorize,

celery/tests/app/test_log.py

@@ -19,7 +19,6 @@ from celery.utils.log import (
     task_logger,
     in_sighandler,
     logger_isa,
-    ensure_process_aware_logger,
 )
 from celery.tests.case import (
     AppCase, Mock, SkipTest,
@@ -363,14 +362,6 @@ class test_task_logger(test_default_logger):
         return get_task_logger('test_task_logger')
 
 
-class test_patch_logger_cls(AppCase):
-
-    def test_patches(self):
-        ensure_process_aware_logger()
-        with in_sighandler():
-            logging.getLoggerClass().log(get_logger('test'))
-
-
 class MockLogger(logging.Logger):
     _records = None
 

celery/tests/bin/test_worker.py

@@ -18,7 +18,6 @@ from celery.exceptions import (
     ImproperlyConfigured, WorkerShutdown, WorkerTerminate,
 )
 from celery.platforms import EX_FAILURE, EX_OK
-from celery.utils.log import ensure_process_aware_logger
 from celery.worker import state
 
 from celery.tests.case import (
@@ -31,8 +30,6 @@ from celery.tests.case import (
     skip_if_jython,
 )
 
-ensure_process_aware_logger()
-
 
 class WorkerAppCase(AppCase):
 

celery/utils/log.py

@@ -27,7 +27,7 @@ from .term import colored
 
 __all__ = ['ColorFormatter', 'LoggingProxy', 'base_logger',
            'set_in_sighandler', 'in_sighandler', 'get_logger',
-           'get_task_logger', 'mlevel', 'ensure_process_aware_logger',
+           'get_task_logger', 'mlevel',
            'get_multiprocessing_logger', 'reset_multiprocessing_logger']
 
 _process_aware = False
@@ -252,35 +252,6 @@ class LoggingProxy(object):
         return False
 
 
-def ensure_process_aware_logger(force=False):
-    """Make sure process name is recorded when loggers are used."""
-    global _process_aware
-    if force or not _process_aware:
-        logging._acquireLock()
-        try:
-            _process_aware = True
-            Logger = logging.getLoggerClass()
-            if getattr(Logger, '_process_aware', False):  # pragma: no cover
-                return
-
-            class ProcessAwareLogger(Logger):
-                _signal_safe = True
-                _process_aware = True
-
-                def makeRecord(self, *args, **kwds):
-                    record = Logger.makeRecord(self, *args, **kwds)
-                    record.processName = current_process()._name
-                    return record
-
-                def log(self, *args, **kwargs):
-                    if _in_sighandler:
-                        return
-                    return Logger.log(self, *args, **kwargs)
-            logging.setLoggerClass(ProcessAwareLogger)
-        finally:
-            logging._releaseLock()
-
-
 def get_multiprocessing_logger():
     return mputil.get_logger() if mputil else None
 
@@ -294,4 +265,3 @@ def current_process_index(base=1):
     if current_process:
         index = getattr(current_process(), 'index', None)
         return index + base if index is not None else index
-ensure_process_aware_logger()