Merge pull request #37 from fyndiq/retry_on_socket_timeout

Set retry_on_timeout from settings
martinrusev · Mar 23, 2016 · 49f43ed · 49f43ed
2 parents 0cb15ae + d1ea4d8
commit 49f43ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/redis_sessions/session.py b/redis_sessions/session.py
@@ -16,6 +16,7 @@
     redis_server = Sentinel(
         settings.SESSION_REDIS_SENTINEL_LIST,
         socket_timeout=settings.SESSION_REDIS_SOCKET_TIMEOUT,
+        retry_on_timeout=settings.SESSION_REDIS_RETRY_ON_TIMEOUT,
         db=getattr(settings, 'SESSION_REDIS_DB', 0),
         password=getattr(settings, 'SESSION_REDIS_PASSWORD', None)
     ).master_for(settings.SESSION_REDIS_SENTINEL_MASTER_ALIAS)
@@ -32,6 +33,7 @@
         host=settings.SESSION_REDIS_HOST,
         port=settings.SESSION_REDIS_PORT,
         socket_timeout=settings.SESSION_REDIS_SOCKET_TIMEOUT,
+        retry_on_timeout=settings.SESSION_REDIS_RETRY_ON_TIMEOUT,
         db=settings.SESSION_REDIS_DB,
         password=settings.SESSION_REDIS_PASSWORD
     )
@@ -40,6 +42,7 @@
     redis_server = redis.StrictRedis(
         unix_socket_path=settings.SESSION_REDIS_UNIX_DOMAIN_SOCKET_PATH,
         socket_timeout=settings.SESSION_REDIS_SOCKET_TIMEOUT,
+        retry_on_timeout=settings.SESSION_REDIS_RETRY_ON_TIMEOUT,
         db=settings.SESSION_REDIS_DB,
         password=settings.SESSION_REDIS_PASSWORD,
     )

diff --git a/redis_sessions/settings.py b/redis_sessions/settings.py
@@ -4,6 +4,7 @@
 SESSION_REDIS_HOST = getattr(settings, 'SESSION_REDIS_HOST', 'localhost')
 SESSION_REDIS_PORT = getattr(settings, 'SESSION_REDIS_PORT', 6379)
 SESSION_REDIS_SOCKET_TIMEOUT = getattr(settings, 'SESSION_REDIS_SOCKET_TIMEOUT', 0.1)
+SESSION_REDIS_RETRY_ON_TIMEOUT = getattr(settings, 'SESSION_REDIS_RETRY_ON_TIMEOUT', False)
 SESSION_REDIS_DB = getattr(settings, 'SESSION_REDIS_DB', 0)
 SESSION_REDIS_PREFIX = getattr(settings, 'SESSION_REDIS_PREFIX', '')
 SESSION_REDIS_PASSWORD = getattr(settings, 'SESSION_REDIS_PASSWORD', None)