Merge pull request Scifabric#1956 from Scifabric/fix-redis-socket-tim…

…eout

fix(redis): socket timeout.

pybossa/default_settings.py

@@ -60,7 +60,7 @@
 REDIS_SENTINEL = [('localhost', 26379)]
 REDIS_MASTER = 'mymaster'
 REDIS_DB = 0
-REDIS_SOCKET_TIMEOUT = 0.1
+REDIS_SOCKET_TIMEOUT = None
 REDIS_RETRY_ON_TIMEOUT = True
 
 REDIS_KEYPREFIX = 'pybossa_cache'

pybossa/sentinel/__init__.py

@@ -29,7 +29,7 @@ def __init__(self, app=None):
             self.init_app(app)
 
     def init_app(self, app):
-        socket_timeout = app.config.get('REDIS_SOCKET_TIMEOUT', 0.1)
+        socket_timeout = app.config.get('REDIS_SOCKET_TIMEOUT', None)
         retry_on_timeout = app.config.get('REDIS_RETRY_ON_TIMEOUT', True)
         self.connection = sentinel.Sentinel(app.config['REDIS_SENTINEL'],
                                             socket_timeout=socket_timeout,

setup.py

@@ -111,7 +111,7 @@
     "rax-default-network-flags-python-novaclient-ext==0.4.0",
     "rax-scheduled-images-python-novaclient-ext==0.3.1",
     "readability-lxml==0.7",
-    "redis==3.0.1",
+    "redis==3.3.6",
     "rednose==1.3.0",
     "requests==2.21.0",
     "requests-oauthlib==1.0.0",
@@ -144,7 +144,7 @@
 
 setup(
     name = 'pybossa',
-    version = '3.0.0',
+    version = '3.0.1',
     packages = find_packages(),
     install_requires = requirements,
     # only needed when installing directly from setup.py (PyPi, eggs?) and pointing to e.g. a git repo.

test/test_model/test_model_base.py

@@ -164,8 +164,8 @@ def test_all(self):
 
         project = db.session.query(Project).get(project_id)
         assert project.name == 'My New Project', project
-        # year would start with 201...
-        assert project.created.startswith('201'), project.created
+        # year would start with 202...
+        assert project.created.startswith('202'), project.created
         assert len(project.tasks) == 1, project
         assert project.owner.name == username, project
         out_task = project.tasks[0]