Removed mystery appearance of reraises_exception config

celery/app/defaults.py

@@ -99,7 +99,7 @@ NAMESPACES = {
         "CONCURRENCY": Option(0, type="int"),
         "ETA_SCHEDULER": Option(None, type="str"),
         "ETA_SCHEDULER_PRECISION": Option(1.0, type="float"),
-        "FORCE_HIJACK_ROOT_LOGGER": Option(False, type="bool"),
+        "HIJACK_ROOT_LOGGER": Option(True, type="bool"),
         "CONSUMER": Option("celery.worker.consumer.Consumer"),
         "LOG_FORMAT": Option(DEFAULT_PROCESS_LOG_FMT),
         "LOG_COLOR": Option(type="bool"),

celery/conf.py

@@ -15,7 +15,6 @@ conf = app_or_default().conf
 
 ALWAYS_EAGER = conf.CELERY_ALWAYS_EAGER
 EAGER_PROPAGATES_EXCEPTIONS = conf.CELERY_EAGER_PROPAGATES_EXCEPTIONS
-EAGER_RERAISES_EXCEPTIONS = conf.CELERY_EAGER_RERAISES_EXCEPTIONS
 RESULT_BACKEND = conf.CELERY_RESULT_BACKEND
 CACHE_BACKEND = conf.CELERY_CACHE_BACKEND
 CACHE_BACKEND_OPTIONS = conf.CELERY_CACHE_BACKEND_OPTIONS

celery/log.py

@@ -93,7 +93,7 @@ class Logging(object):
         if not receivers:
             root = logging.getLogger()
 
-            if self.app.conf.CELERYD_FORCE_HIJACK_ROOT_LOGGER:
+            if self.app.conf.CELERYD_HIJACK_ROOT_LOGGER:
                 root.handlers = []
 
             mp = mputil.get_logger()
@@ -138,7 +138,7 @@ class Logging(object):
         format = format or self.format
         colorize = self.app.either("CELERYD_LOG_COLOR", colorize)
 
-        if not root or self.app.conf.CELERYD_FORCE_HIJACK_ROOT_LOGGER:
+        if not root or self.app.conf.CELERYD_HIJACK_ROOT_LOGGER:
             return self._setup_logger(self.get_default_logger(loglevel, name),
                                       logfile, format, colorize, **kwargs)
         self.setup_logging_subsystem(loglevel, logfile,

celery/tests/config.py

@@ -2,6 +2,8 @@ import os
 
 BROKER_BACKEND = "memory"
 
+#: Don't want log output when running suite.
+CELERYD_HIJACK_ROOT_LOGGER = False
 
 CELERY_RESULT_BACKEND = "database"
 CELERY_RESULT_DBURI = "sqlite:///test.db"