clean up the concurrency option too stop passing other args

ckan · Jul 20, 2012 · 7c8d450 · 7c8d450 · davidread · Jul 23, 2012
1 parent a17c5f4
commit 7c8d450
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
@@ -781,11 +781,12 @@ class Celery(CkanCommand):
     Usage:
         celeryd       - run the celery daemon
         celeryd run   - run the celery daemon
-        celeryd run concurrency=1 - run the celery daemon with argument 'concurrency'
+        celeryd run concurrency - run the celery daemon with argument 'concurrency'
         celeryd view  - view all tasks in the queue
         celeryd clean - delete all tasks in the queue
     '''
     min_args = 0
+    max_args = 2
     summary = __doc__.split('\n')[0]
     usage = __doc__
 
@@ -807,7 +808,9 @@ def command(self):
     def run_(self):
         os.environ['CKAN_CONFIG'] = os.path.abspath(self.options.config)
         from ckan.lib.celery_app import celery
-        celery_args = ['--%s' % arg for arg in self.args[1:]]
+        celery_args = []
+        if len(self.args) == 2 and self.args[1] == 'concurrency':
+            celery_args.append['--concurrency=1']
         celery.worker_main(argv=['celeryd', '--loglevel=INFO'] + celery_args)
 
     def view(self):