Merge pull request #1801 from rtfd/cache-direct

Alter direct calls to redis using intermediate redis settings

Author: ericholscher

readthedocs/api/base.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 from django.conf.urls import url
 from django.shortcuts import get_object_or_404
+from django.core.cache import cache
 
 from tastypie import fields
 from tastypie.authorization import DjangoAuthorization
@@ -25,9 +26,6 @@
 log = logging.getLogger(__name__)
 
 
-redis_client = redis.Redis(**settings.REDIS)
-
-
 class ProjectResource(ModelResource, SearchMixin):
     users = fields.ToManyField('readthedocs.api.base.UserResource', 'users')
 
@@ -223,7 +221,11 @@ def get_anchor(self, request, **kwargs):
         self.throttle_check(request)
 
         query = request.GET.get('q', '')
-        redis_data = redis_client.keys("*redirects:v4*%s*" % query)
+        try:
+            redis_client = cache.get_client(None)
+            redis_data = redis_client.keys("*redirects:v4*%s*" % query)
+        except (AttributeError, redis.exceptions.ConnectionError):
+            redis_data = []
         # -2 because http:
         urls = [''.join(data.split(':')[6:]) for data in redis_data
                 if 'http://' in data]

readthedocs/builds/views.py

@@ -44,7 +44,7 @@ def get_context_data(self, **kwargs):
         context['versions'] = Version.objects.public(user=self.request.user, project=self.project)
 
         try:
-            redis = Redis(**settings.REDIS)
+            redis = Redis.from_url(settings.BROKER_URL)
             context['queue_length'] = redis.llen('celery')
         except ConnectionError:
             context['queue_length'] = None

readthedocs/projects/utils.py

@@ -7,8 +7,9 @@
 import logging
 from httplib2 import Http
 
-from django.conf import settings
 import redis
+from django.conf import settings
+from django.core.cache import cache
 
 
 log = logging.getLogger(__name__)
@@ -149,18 +150,21 @@ def purge_version(version, mainsite=False, subdomain=False, cname=False):
                 log.info("Purging %s on readthedocs.org", root_url)
                 h.request(to_purge, method="PURGE", headers=headers)
             if cname:
-                redis_conn = redis.Redis(**settings.REDIS)
-                for cnamed in redis_conn.smembers('rtd_slug:v1:%s'
-                                                  % version.project.slug):
-                    headers = {'Host': cnamed}
-                    url = "/en/%s/*" % version.slug
-                    to_purge = "http://%s%s" % (server, url)
-                    log.info("Purging %s on %s", url, cnamed)
-                    h.request(to_purge, method="PURGE", headers=headers)
-                    root_url = "/"
-                    to_purge = "http://%s%s" % (server, root_url)
-                    log.info("Purging %s on %s", root_url, cnamed)
-                    h.request(to_purge, method="PURGE", headers=headers)
+                try:
+                    redis_client = cache.get_client(None)
+                    for cnamed in redis_client.smembers('rtd_slug:v1:%s'
+                                                        % version.project.slug):
+                        headers = {'Host': cnamed}
+                        url = "/en/%s/*" % version.slug
+                        to_purge = "http://%s%s" % (server, url)
+                        log.info("Purging %s on %s", url, cnamed)
+                        h.request(to_purge, method="PURGE", headers=headers)
+                        root_url = "/"
+                        to_purge = "http://%s%s" % (server, root_url)
+                        log.info("Purging %s on %s", root_url, cnamed)
+                        h.request(to_purge, method="PURGE", headers=headers)
+                except (AttributeError, redis.exceptions.ConnectionError):
+                    pass
 
 
 class DictObj(object):

readthedocs/settings/onebox.py

@@ -9,11 +9,6 @@
     }
 }
 
-REDIS = {
-    'host': 'localhost',
-    'port': 6379,
-    'db': 0,
-}
 BROKER_URL = 'redis://localhost:6379/0'
 CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
 CELERY_ALWAYS_EAGER = False

readthedocs/settings/sqlite.py

@@ -9,12 +9,6 @@
     }
 }
 
-REDIS = {
-    'host': 'localhost',
-    'port': 6379,
-    'db': 0,
-}
-
 BROKER_URL = 'redis://localhost:6379/0'
 CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
 # CELERY_ALWAYS_EAGER = False

requirements/deploy.txt

@@ -2,7 +2,7 @@
 psycopg2==2.4.6
 gunicorn==19.1.0
 pysolr==2.0.13
-django-redis-cache==0.9.5
+django-redis-cache==1.6.3
 django-mailgun==0.2.2
 
 hiredis==0.1.2

requirements/pip.txt

@@ -22,7 +22,7 @@ slumber==0.6.0
 lxml==3.3.5
 
 # Basic tools
-redis==2.7.1
+redis==2.10.3
 celery==3.1.18
 django-celery==3.1.16
 django-allauth==0.21.0