Skip to content

Pass connection options through CACHEOPS_SENTINEL #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pass connection options through CACHEOPS_SENTINEL #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9afca8
Pass connection options through CACHEOPS_SENTINEL
davidfb Sep 6, 2018
b7da7fa
Use funcy.omit() to build Sentinel configuration
davidfb Sep 17, 2018
37eeb87
Use funcy.omit() to build Sentinel configuration
davidfb Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cacheops/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down