diff --git a/cacheops/redis.py b/cacheops/redis.py index 7262085e..ebb2d01f 100644 --- a/cacheops/redis.py +++ b/cacheops/redis.py @@ -6,7 +6,7 @@ from django.core.exceptions import ImproperlyConfigured from django.utils.module_loading import import_string -from funcy import decorator, identity, memoize, LazyObject +from funcy import decorator, identity, memoize, omit, LazyObject import redis from redis.sentinel import Sentinel from .conf import settings @@ -93,12 +93,13 @@ def redis_client(): if not {'locations', 'service_name'} <= set(settings.CACHEOPS_SENTINEL): raise ImproperlyConfigured("Specify locations and service_name for CACHEOPS_SENTINEL") - sentinel = Sentinel(settings.CACHEOPS_SENTINEL['locations']) + sentinel = Sentinel( + settings.CACHEOPS_SENTINEL['locations'], + **omit(settings.CACHEOPS_SENTINEL, ('locations', 'service_name', 'db'))) return sentinel.master_for( settings.CACHEOPS_SENTINEL['service_name'], redis_class=client_class, - db=settings.CACHEOPS_SENTINEL.get('db', 0), - socket_timeout=settings.CACHEOPS_SENTINEL.get('socket_timeout') + db=settings.CACHEOPS_SENTINEL.get('db', 0) ) # Allow client connection settings to be specified by a URL.