cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strictredis if sentinel_master_id is not null

Browse Source 
Also, use only a redis_host and redis_port attributes either if the
connection is to redis or to sentinel
This commit is contained in:
Luis Bosque
2016-02-22 09:50:11 +01:00
committed by Mario de Frutos
parent 472d8c2360
commit 6c5b1b4e99
3 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py
View File

@@ -6,28 +6,26 @@ class RedisConnection:
REDIS_DEFAULT_USER_DB = 5
REDIS_DEFAULT_TIMEOUT = 2 #seconds
REDIS_SENTINEL_DEFAULT_PORT = 26379
REDIS_DEFAULT_PORT = 6379
#REDIS_SENTINEL_DEFAULT_PORT = 26379
#REDIS_DEFAULT_PORT = 6379
def __init__(self, sentinel_host, sentinel_port, sentinel_master_id,
redis_host, redis_db=REDIS_DEFAULT_USER_DB, **kwargs):
self.sentinel_host = sentinel_host
self.sentinel_port = sentinel_port
self.sentinel_master_id = sentinel_master_id
def __init__(self, sentinel_master_id, redis_host, redis_port,
redis_db=REDIS_DEFAULT_USER_DB, **kwargs):
self.redis_host = redis_host
self.redis_port = redis_port
self.sentinel_master_id = sentinel_master_id
self.timeout = kwargs['timeout'] if 'timeout' in kwargs else self.REDIS_DEFAULT_TIMEOUT
self.redis_db = redis_db
self.redis_port = self.REDIS_DEFAULT_PORT
def redis_connection(self):
return self.__create_redis_connection()
def __create_redis_connection(self):
if (self.sentinel_host == None) or (self.sentinel_master_id == None):
if self.sentinel_master_id == None:
return StrictRedis(host=self.redis_host, port=self.redis_port, db=self.redis_db)
else:
sentinel = Sentinel([(self.sentinel_host,
self.REDIS_SENTINEL_DEFAULT_PORT)],
sentinel = Sentinel([(self.redis_host,
self.redis_port)],
socket_timeout=self.timeout)
return sentinel.master_for(
self.sentinel_master_id,