Merge branch 'hotfix/0.9.1'

CenterForOpenScience · Jul 30, 2015 · 6aa807b · 6aa807b
2 parents 7d7407e + 84760e3
commit 6aa807b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tasks.py b/tasks.py
@@ -40,9 +40,14 @@ def test(verbose=False):
 
 
 @task
-def celery():
+def celery(loglevel='INFO', hostname='%h'):
     from waterbutler.tasks.app import app
-    app.worker_main(['worker', '-l', 'INFO'])
+    command = ['worker']
+    if loglevel:
+        command.extend(['--loglevel', loglevel])
+    if hostname:
+        command.extend(['--hostname', hostname])
+    app.worker_main(command)
 
 
 @task

diff --git a/waterbutler/__init__.py b/waterbutler/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.9.0'
+__version__ = '0.9.1'
 __import__('pkg_resources').declare_namespace(__name__)