Merge pull request #24 from praekelt/feature/redis-celery

prefer redis as the default celery broker, fewer moving parts than rabbi...
praekeltfoundation · Aug 1, 2014 · 078d874 · 078d874
2 parents f4dc805 + 70b64c3
commit 078d874
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/control/settings.py b/control/settings.py
@@ -182,7 +182,6 @@ def abspath(*args):
 }
 
 # Celery configuration options
-BROKER_URL = "amqp://guest:guest@localhost:5672/"
 CELERY_RESULT_BACKEND = "database"
 CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
 
@@ -229,6 +228,8 @@ def abspath(*args):
 SNAPPY_MAILBOX_ID = 1
 SNAPPY_EMAIL = "replaceme@example.org"
 
+BROKER_URL = 'redis://localhost:6379/0'
+
 try:
     from local_settings import *
 except ImportError:

diff --git a/requirements.txt b/requirements.txt
@@ -15,3 +15,4 @@ pyflakes==0.8.1
 django-tastypie==0.11.1
 go-http==0.1.0
 flower==0.7.1
+redis==2.10.1