Merge pull request #84 from bloomberg/redis-pwd

add password
bloomberg · Sep 4, 2018 · 3b8a309 · 3b8a309
2 parents 028e65f + 1745ef7
commit 3b8a309
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pybossa/sentinel/__init__.py b/pybossa/sentinel/__init__.py
@@ -28,20 +28,24 @@ def __init__(self, app=None):
             self.init_app(app)
 
     def init_app(self, app):
-        redis_db = app.config.get('REDIS_DB') or 0
+        conn_kwargs = {
+            'db': app.config.get('REDIS_DB') or 0,
+            'password': app.config.get('REDIS_PWD')
+        }
         if app.config.get('REDIS_MASTER_DNS') and \
             app.config.get('REDIS_SLAVE_DNS') and \
             app.config.get('REDIS_PORT'):
+            conn_kwargs['socket_timeout'] = 0.1
             self.master = StrictRedis(host=app.config['REDIS_MASTER_DNS'],
-                port=app.config['REDIS_PORT'], db=redis_db)
+                port=app.config['REDIS_PORT'], **conn_kwargs)
             self.slave = StrictRedis(host=app.config['REDIS_SLAVE_DNS'],
-                port=app.config['REDIS_PORT'], db=redis_db)
+                port=app.config['REDIS_PORT'], **conn_kwargs)
         else:
             self.connection = sentinel.Sentinel(app.config['REDIS_SENTINEL'],
-                                                      socket_timeout=0.1)
+                                                socket_timeout=0.1)
             redis_master = app.config.get('REDIS_MASTER') or 'mymaster'
-            self.master = self.connection.master_for(redis_master, db=redis_db)
-            self.slave = self.connection.slave_for(redis_master, db=redis_db)
+            self.master = self.connection.master_for(redis_master, **conn_kwargs)
+            self.slave = self.connection.slave_for(redis_master, **conn_kwargs)
 
 
 def scan_iter(conn, match, count=None):

diff --git a/settings_local.py.tmpl b/settings_local.py.tmpl
@@ -158,6 +158,7 @@ REDIS_DB = 0
 REDIS_KEYPREFIX = 'pybossa_cache'
 REDIS_MASTER_DNS = 'myredis.master.cache.dns.com'
 REDIS_SLAVE_DNS = 'myredis.slave.cache.dns.com'
+REDIS_PWD = 'hellothere'
 
 ## Allowed upload extensions
 ALLOWED_EXTENSIONS = ['js', 'css', 'png', 'jpg', 'jpeg', 'gif', 'zip']