From 9693375acc5c3076046f58a15a102500b582674a Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sat, 9 Mar 2013 11:45:48 -0800
Subject: [PATCH] upgraded kombu, looking good
---
requirements.txt | 5 ++---
settings.py | 9 ++++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 50eb2a2..67248e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,9 @@
Django==1.4.5
South==0.7.3
-amqplib==1.0.2
anyjson==0.3.1
-celery==2.3.3
+celery==3.0.16
distribute==0.6.24
-django-celery==2.3.3
+django-celery==3.0.11
django-picklefield==0.1.9
kombu==2.5.7
psycopg2==2.4.1
diff --git a/settings.py b/settings.py
index 1189078..5904a89 100644
--- a/settings.py
+++ b/settings.py
@@ -85,7 +85,7 @@ INSTALLED_APPS = (
'django.contrib.sites',
## needed for queues
'djcelery',
- 'kombu',
+ 'kombu.transport.django',
## needed for schema migration
'south',
## HELIOS stuff
@@ -185,11 +185,14 @@ logging.basicConfig(
format = '%(asctime)s %(levelname)s %(message)s'
)
+# BROKER_URL = "django://"
+
# set up django-celery
+BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
+CELERY_RESULT_DBURI = DATABASES['default']
import djcelery
djcelery.setup_loader()
-BROKER_BACKEND = "kombu.transport.django"
-CELERY_RESULT_DBURI = DATABASES['default']
+
# for testing
#CELERY_ALWAYS_EAGER = True
--
GitLab