celery.bin.celerybeat: Can now override defaults to use instead of celery.conf

celery/bin/celerybeat.py

@@ -68,16 +68,13 @@ OPTION_LIST = (
 class Beat(object):
     Service = beat.Service
 
-    def __init__(self, loglevel=conf.CELERYBEAT_LOG_LEVEL,
-            logfile=conf.CELERYBEAT_LOG_FILE,
-            schedule=conf.CELERYBEAT_SCHEDULE_FILENAME,
-            max_interval=None,
-            scheduler_cls=None, **kwargs):
+    def __init__(self, loglevel=None, logfile=None, schedule=None,
+            max_interval=None, scheduler_cls=None, defaults=conf, **kwargs):
         """Starts the celerybeat task scheduler."""
 
-        self.loglevel = loglevel
-        self.logfile = logfile
-        self.schedule = schedule
+        self.loglevel = loglevel or defaults.CELERYBEAT_LOG_LEVEL
+        self.logfile = logfile or defaults.CELERYBEAT_LOG_FILE
+        self.schedule = schedule or defaults.CELERYBEAT_SCHEDULE_FILENAME
         self.scheduler_cls = scheduler_cls
         self.max_interval = max_interval
 

celery/bin/celeryd.py

@@ -119,7 +119,7 @@ OPTION_LIST = (
         action="store", dest="concurrency", type="int",
         help="Number of child processes processing the queue."),
     Option('-V', '--version',
-        action="callback", callback=dump_version,
+        action="callback", callback=dump_version, nargs=0,
         help="Show version information and exit."),
     Option('--purge', '--discard', default=False,
         action="store_true", dest="discard",