log.setup_task_logger accidentally setup loggers with the task format.

celery/log.py

@@ -61,12 +61,12 @@ def setup_logging_subsystem(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
         **kwargs):
     global _setup
     if not _setup:
-        ensure_process_aware_logger()
-        logging.Logger.manager.loggerDict.clear()
         try:
             mputil._logger = None
         except AttributeError:
             pass
+        ensure_process_aware_logger()
+        logging.Logger.manager.loggerDict.clear()
         receivers = signals.setup_logging.send(sender=None,
                                                loglevel=loglevel,
                                                logfile=logfile,
@@ -120,7 +120,7 @@ def setup_logger(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
 
 def setup_task_logger(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
         format=conf.CELERYD_TASK_LOG_FORMAT, colorize=conf.CELERYD_LOG_COLOR,
-        task_kwargs=None, root=True, **kwargs):
+        task_kwargs=None, **kwargs):
     """Setup the task logger. If ``logfile`` is not specified, then
     ``stderr`` is used.
 
@@ -132,12 +132,8 @@ def setup_task_logger(loglevel=conf.CELERYD_LOG_LEVEL, logfile=None,
     task_kwargs.setdefault("task_id", "-?-")
     task_name = task_kwargs.get("task_name")
     task_kwargs.setdefault("task_name", "-?-")
-    if not root:
-        logger = _setup_logger(get_task_logger(loglevel, task_name),
-                               logfile, format, colorize, **kwargs)
-    else:
-        setup_logging_subsystem(loglevel, logfile, format, colorize, **kwargs)
-        logger = get_task_logger(name=task_name)
+    logger = _setup_logger(get_task_logger(loglevel, task_name),
+                            logfile, format, colorize, **kwargs)
     return LoggerAdapter(logger, task_kwargs)
 
 
@@ -148,6 +144,7 @@ def _setup_logger(logger, logfile, format, colorize,
 
     if logger.handlers: # Logger already configured
         return logger
+
     handler = _detect_handler(logfile)
     handler.setFormatter(formatter(format, use_color=colorize))
     logger.addHandler(handler)

celery/worker/__init__.py

@@ -16,7 +16,6 @@ from celery import log
 from celery import registry
 from celery import platform
 from celery import signals
-from celery.log import setup_logger
 from celery.utils import noop, instantiate
 
 from celery.worker import state
@@ -134,7 +133,7 @@ class WorkController(object):
         self.loglevel = loglevel or self.loglevel
         self.concurrency = concurrency or self.concurrency
         self.logfile = logfile or self.logfile
-        self.logger = setup_logger(loglevel, logfile)
+        self.logger = log.get_default_logger()
         self.hostname = hostname or socket.gethostname()
         self.embed_clockservice = embed_clockservice
         self.ready_callback = ready_callback