From 7c6ed136ebe1780d58049aa9d67f4b562b6794dc Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 31 Jan 2016 20:34:54 +0100
Subject: [PATCH] Switch result backend to redis

The AMQP result backend proved as impractical, this commit switches to
redis instead.
---
 gvaldap/gvaldap/settings/base.py | 3 +--
 requirements/base.txt            | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py
index 02fec0f..dbe55a8 100644
--- a/gvaldap/gvaldap/settings/base.py
+++ b/gvaldap/gvaldap/settings/base.py
@@ -287,8 +287,7 @@ USER_BASE_DN = get_env_variable('GVALDAP_BASEDN_USER')
 
 ########## CELERY CONFIGURATION
 BROKER_URL = get_env_variable('GVALDAP_BROKER_URL')
-CELERY_RESULT_BACKEND = 'rpc://'
-CELERY_RESULT_PERSISTENT = True
+CELERY_RESULT_BACKEND = get_env_variable('GVALDAP_RESULTS_REDIS_URL')
 CELERY_TASK_RESULT_EXPIRES = None
 CELERY_ROUTES = (
     'gvacommon.celeryrouters.GvaRouter',
diff --git a/requirements/base.txt b/requirements/base.txt
index b42ce77..0f0c966 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,6 +4,7 @@ bpython==0.13.2
 django-braces==1.4.0
 django-model-utils==2.2
 logutils==0.3.3
-celery==3.1.17
+celery==3.1.20
 passlib==1.6.2
 requests==2.5.1
+redis==2.10.5