[bug 578067] Upgrade to celery 2

mythmon · Sep 14, 2010 · fca0843 · fca0843
1 parent 3f48824
commit fca0843
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -3,7 +3,8 @@
 GitPython==0.1.7
 python-memcached==1.45
 Babel>=0.9.4
-celery==1.0.6
+django-celery==2.0.2
+celery==2.0.3
 python-dateutil
 django-taggit==0.8.0
 pytz

diff --git a/settings.py b/settings.py
@@ -176,7 +176,7 @@
     'sumo',
     'search',
     'forums',
-    'celery',
+    'djcelery',
     'cronjobs',
     'notifications',
     'identicons',
@@ -387,6 +387,9 @@ def JINJA_CONFIG():
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 # Celery
+import djcelery
+djcelery.setup_loader()
+
 BROKER_HOST = 'localhost'
 BROKER_PORT = 5672
 BROKER_USER = 'kitsune'

diff --git a/wsgi/kitsune.wsgi b/wsgi/kitsune.wsgi
@@ -9,6 +9,9 @@ wsgi_loaded = datetime.now()
 wsgidir = os.path.dirname(__file__)
 site.addsitedir(os.path.abspath(os.path.join(wsgidir, '../')))
 
+# For django-celery
+os.environ['CELERY_LOADER'] = 'django'
+
 # manage adds /apps, /lib, and /vendor to the Python path.
 import manage