Allow for --logfile to work even if not detached, also set all default log files to None (stderr)

celery/bin/celerybeat.py

@@ -72,7 +72,7 @@ OPTION_LIST = (
             help="Path to the schedule database. The extension \
                     '.db' will be appended to the filename. Default: %s" % (
                     conf.CELERYBEAT_SCHEDULE_FILENAME)),
-    optparse.make_option('-f', '--logfile', default=conf.CELERYBEAT_LOG_FILE,
+    optparse.make_option('-f', '--logfile', default=EAT_LOG_FILE,
             action="store", dest="logfile",
             help="Path to log file."),
     optparse.make_option('-l', '--loglevel',
@@ -115,8 +115,6 @@ def run_clockservice(detach=False, loglevel=conf.CELERYBEAT_LOG_LEVEL,
     # Setup logging
     if not isinstance(loglevel, int):
         loglevel = conf.LOG_LEVELS[loglevel.upper()]
-    if not detach:
-        logfile = None # log to stderr when not running in the background.
 
     # Run the worker init handler.
     # (Usually imports task modules and such.)

celery/bin/celeryd.py

@@ -165,8 +165,6 @@ def run_worker(concurrency=conf.CELERYD_CONCURRENCY, detach=False,
     # Setup logging
     if not isinstance(loglevel, int):
         loglevel = conf.LOG_LEVELS[loglevel.upper()]
-    if not detach:
-        logfile = None # log to stderr when not running in the background.
 
     if discard:
         discarded_count = discard_all()

celery/conf.py

@@ -30,15 +30,15 @@ _DEFAULTS = {
     "CELERYD_CONCURRENCY": 0, # defaults to cpu count
     "CELERYD_LOG_FORMAT": DEFAULT_P_LOG_FMT,
     "CELERYD_LOG_LEVEL": "WARN",
-    "CELERYD_LOG_FILE": "celeryd.log",
+    "CELERYD_LOG_FILE": None, # stderr
     "CELERYD_PID_FILE": "celeryd.pid",
     "CELERYBEAT_SCHEDULE_FILENAME": "celerybeat-schedule",
     "CELERYBEAT_MAX_LOOP_INTERVAL": 5 * 60, # five minutes.
     "CELERYBEAT_LOG_LEVEL": "INFO",
-    "CELERYBEAT_LOG_FILE": "celerybeat.log",
+    "CELERYBEAT_LOG_FILE": None, # stderr
     "CELERYBEAT_PID_FILE": "celerybeat.pid",
     "CELERYMON_LOG_LEVEL": "INFO",
-    "CELERYMON_LOG_FILE": "celerymon.log",
+    "CELERYMON_LOG_FILE": None, # stderr
     "CELERYMON_PID_FILE": "celerymon.pid",
     "CELERYMON_LOG_FORMAT": DEFAULT_LOG_FMT,
     "CELERY_BROADCAST_QUEUE": "celeryctl",