From d625b26e573a293f5fa93ffe001153a73be45eb0 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Fri, 1 Apr 2016 08:45:09 +0200
Subject: [PATCH] Fixed timeout and random problems

---
 .../cartodb_services/cartodb_services/mapzen/qps.py    |  1 +
 .../cartodb_services/tools/redis_tools.py              | 10 ++++++----
 server/lib/python/cartodb_services/setup.py            |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py b/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
index 40ff1c7..fe8ebb2 100644
--- a/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
+++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py
@@ -1,4 +1,5 @@
 import time
+import random
 from datetime import datetime
 from exceptions import TimeoutException
 
diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py b/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py
index ab24a15..24ba3c8 100644
--- a/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py
+++ b/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py
@@ -23,14 +23,15 @@ class RedisConnection:
             )
         else:
             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
 
 
 class RedisDBConfig:
 
     DEFAULT_USER_DB = 5
-    DEFAULT_TIMEOUT = 2  # seconds
+    DEFAULT_TIMEOUT = 1.5  # seconds
 
     def __init__(self, key, db_conn):
         self._db_conn = db_conn
@@ -63,8 +64,9 @@ class RedisDBConfig:
                 self._sentinel_id = None
 
     def __str__(self):
-        return "Host: {0}, Port: {1}, Sentinel id: {2}, DB: {3}".format(
-            self.host, self.port, self.sentinel_id, self.db)
+        return "Host: {0}, Port: {1}, Sentinel id: {2}, DB: {3}, " \
+               "Timeout: {4}".format(self.host, self.port, self.sentinel_id,
+                                     self.db, self.timeout)
 
     @property
     def host(self):
diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py
index 633f24c..de5dd35 100644
--- a/server/lib/python/cartodb_services/setup.py
+++ b/server/lib/python/cartodb_services/setup.py
@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
 setup(
     name='cartodb_services',
 
-    version='0.4.0',
+    version='0.4.1',
 
     description='CartoDB Services API Python Library',