Merge pull request nkrode#53 from allanparsons/master

Updated to support Redis instances w/ password challenges

Author: nkrode

src/api/controller/ServerListController.py

@@ -16,7 +16,7 @@ def read_server_config(self):
 
         for server in redis_servers:
             server_id = "%(server)s:%(port)s" % server
-            s = dict(server=server['server'], port=server['port'], id=server_id)
+            s = dict(server=server['server'], port=server['port'], password=server['password'], id=server_id)
             server_list.append(s)
 
         return server_list

src/dataprovider/redisprovider.py

@@ -13,7 +13,11 @@ def __init__(self):
         stats_server = settings.get_redis_stats_server()
         self.server = stats_server["server"]
         self.port = stats_server["port"]
-        self.conn = redis.StrictRedis(host=self.server, port=self.port, db=0)
+        if stats_server["password"]:
+            self.password = stats_server["password"]
+        else:
+            self.password = None
+        self.conn = redis.StrictRedis(host=self.server, port=self.port, db=0, password=self.password)
 
     def save_memory_info(self, server, timestamp, used, peak):
         """Saves used and peak memory stats,

src/redis-live.conf

@@ -1,17 +1,23 @@
 {
 	"RedisServers":
 	[ 
-		{
-		  "server": "127.0.0.1",
-		  "port" : 6379
-		}
+{
+  "server": "154.17.59.99,
+  "port" : 6379,
+},
+{
+  "server": "localhost",
+  "port" : 6380,
+  "password" : "some-password"
+}
+}
 	],
 
 	"DataStoreType" : "redis",
 
 	"RedisStatsServer":
 	{
-		"server" : "127.0.0.1",
-		"port" : 6381
+		"server" : "ec2-184-72-166-144.compute-1.amazonaws.com",
+		"port" : 6385
 	}	
 }

src/redis-monitor.py

@@ -246,15 +246,20 @@ def run(self, duration):
         """
         redis_servers = settings.get_redis_servers()
 
+
         for redis_server in redis_servers:
-            monitor = MonitorThread(redis_server["server"], redis_server["port"],
-                                   redis_server.get("password", None))
+
+            if redis_server["password"]:
+                redis_password = redis_server["password"]
+            else:
+                redis_password = None
+
+            monitor = MonitorThread(redis_server["server"], redis_server["port"], redis_password)
             self.threads.append(monitor)
             monitor.setDaemon(True)
             monitor.start()
 
-            info = InfoThread(redis_server["server"], redis_server["port"],
-                              redis_server.get("password", None))
+            info = InfoThread(redis_server["server"], redis_server["port"], redis_password)
             self.threads.append(info)
             info.setDaemon(True)
             info.start()