Simplified celery configuration.

galaxyproject · Jun 18, 2016 · 28bfc28 · 28bfc28
1 parent 60d101d
commit 28bfc28
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 40 deletions.
diff --git a/django-cloudlaunch/cloudlaunch/__init__.py b/django-cloudlaunch/cloudlaunch/__init__.py
@@ -1,5 +0,0 @@
-from __future__ import absolute_import
-
-# This will make sure the app is always imported when
-# Django starts so that shared_task will use this app.
-from .celery import app as celery_app  # noqa

diff --git a/django-cloudlaunch/cloudlaunch/celery.py b/django-cloudlaunch/cloudlaunch/celery.py
diff --git a/django-cloudlaunch/cloudlaunch/celeryconfig.py b/django-cloudlaunch/cloudlaunch/celeryconfig.py
diff --git a/django-cloudlaunch/cloudlaunch/settings.py b/django-cloudlaunch/cloudlaunch/settings.py
@@ -16,6 +16,12 @@
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
+# Celery configuration
+BROKER_URL = 'django://'
+import djcelery
+djcelery.setup_loader()
+CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend'
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
 
@@ -61,7 +67,6 @@
     # rest framework must come after baselaunch so templates can be overridden
     'rest_framework',
     'djcelery',
-    'kombu.transport.django' # must be last so all celery tasks are discovered
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -177,7 +182,3 @@
     pass
 
 # django-celery configuration
-
-BROKER_URL = 'django://'
-import djcelery
-djcelery.setup_loader()