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

Merge master

Browse Source
This commit is contained in:
Carla Iriberri
2016-04-01 10:18:46 +02:00
parent 8c5a4d32de 0ba513d13d
commit 752d8317a2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
+1
View File
@@ -1,4 +1,5 @@
import time import time
import random
from datetime import datetime from datetime import datetime
from exceptions import TimeoutException from exceptions import TimeoutException
server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py
+6 -4
View File
@@ -23,14 +23,15 @@ class RedisConnection:
) )
else: else:
conn = StrictRedis(host=self._config.host, port=self._config.port, conn = StrictRedis(host=self._config.host, port=self._config.port,
db=self._config.db) db=self._config.db,
socket_timeout=self._config.timeout)
return conn return conn
class RedisDBConfig: class RedisDBConfig:
DEFAULT_USER_DB = 5 DEFAULT_USER_DB = 5
DEFAULT_TIMEOUT = 2 # seconds DEFAULT_TIMEOUT = 1.5 # seconds
def __init__(self, key, db_conn): def __init__(self, key, db_conn):
self._db_conn = db_conn self._db_conn = db_conn
@@ -63,8 +64,9 @@ class RedisDBConfig:
self._sentinel_id = None self._sentinel_id = None
def __str__(self): def __str__(self):
return "Host: {0}, Port: {1}, Sentinel id: {2}, DB: {3}".format( return "Host: {0}, Port: {1}, Sentinel id: {2}, DB: {3}, " \
self.host, self.port, self.sentinel_id, self.db) "Timeout: {4}".format(self.host, self.port, self.sentinel_id,
self.db, self.timeout)
@property @property
def host(self): def host(self):