Merge pull request sebleier#89 from sebleier/unstable

Unstable

Author: sebleier

redis_cache/backends/base.py

@@ -57,6 +57,7 @@ def __init__(self, server, params):
         self.parser_class = self.get_parser_class()
         self.pickle_version = self.get_pickle_version()
         self.socket_timeout = self.get_socket_timeout()
+        self.socket_connect_timeout = self.get_socket_connect_timeout()
         self.connection_pool_class = self.get_connection_pool_class()
         self.connection_pool_class_kwargs = (
             self.get_connection_pool_class_kwargs()
@@ -106,13 +107,21 @@ def get_pickle_version(self):
         try:
             return int(_pickle_version)
         except (ValueError, TypeError):
-            raise ImproperlyConfigured("pickle version value must be an integer")
+            raise ImproperlyConfigured(
+                "pickle version value must be an integer"
+            )
 
     def get_socket_timeout(self):
         return self.options.get('SOCKET_TIMEOUT', None)
 
+    def get_socket_connect_timeout(self):
+        return self.options.get('SOCKET_CONNECT_TIMEOUT', None)
+
     def get_connection_pool_class(self):
-        pool_class = self.options.get('CONNECTION_POOL_CLASS', 'redis.ConnectionPool')
+        pool_class = self.options.get(
+            'CONNECTION_POOL_CLASS',
+            'redis.ConnectionPool'
+        )
         return import_class(pool_class)
 
     def get_connection_pool_class_kwargs(self):
@@ -160,6 +169,7 @@ def create_client(self, server):
             db=self.db,
             password=self.password,
             socket_timeout=self.socket_timeout,
+            socket_connect_timeout=self.socket_connect_timeout,
         )
         client = redis.Redis(**kwargs)
         kwargs.update(

redis_cache/connection.py

@@ -31,6 +31,7 @@ def get_connection_pool(
         connection_pool_class=None,
         connection_pool_class_kwargs=None,
         socket_timeout=None,
+        socket_connect_timeout=None,
         **kwargs
     ):
         connection_identifier = (host, port, db, unix_socket_path)
@@ -51,6 +52,10 @@ def get_connection_pool(
                 'parser_class': parser_class,
                 'socket_timeout': socket_timeout,
             }
+
+            if not issubclass(connection_class, UnixDomainSocketConnection):
+                kwargs['socket_connect_timeout'] = socket_connect_timeout
+
             kwargs.update(connection_pool_class_kwargs)
 
             if unix_socket_path is None:

setup.py

@@ -5,7 +5,7 @@
     url="http://github.com/sebleier/django-redis-cache/",
     author="Sean Bleier",
     author_email="[email protected]",
-    version="1.5.1",
+    version="1.5.2",
     packages=["redis_cache", "redis_cache.backends"],
     description="Redis Cache Backend for Django",
     install_requires=['redis>=2.10.3'],