Merge pull request #2277 from Chuwiey/redis_down_fix

Redis down fix

Author: sgress454

lib/hooks/sockets/lib/loadSocketIO.js

@@ -4,11 +4,11 @@ module.exports = function (sails) {
 	 * Module dependencies.
 	 */
 
-	var		util			= require( 'sails-util'),
+	var	util					= require( 'sails-util'),
 			SocketServer	= require('socket.io'),
 			RedisStore		= require('socket.io/lib/stores/redis'),
-			Redis			= require('socket.io/node_modules/redis'),
-			Socket			= {
+			Redis					= require('socket.io/node_modules/redis'),
+			Socket				= {
 				authorization	: require('./authorization')(sails),
 				connection		: require('./connection')(sails)
 			};
@@ -66,9 +66,9 @@ module.exports = function (sails) {
 				var host = socketConfig.host || '127.0.0.1';
 				var port = socketConfig.port || 6379;
 
-				var pub = createRedisConnection(port, host);
-				var sub = createRedisConnection(port, host);
-				var client = createRedisConnection(port, host);
+				var pub = createRedisConnection(port, host, 'pub');
+				var sub = createRedisConnection(port, host, 'sub');
+				var client = createRedisConnection(port, host, 'client');
 
 				var storeConfig = {
 					redisPub: pub,
@@ -136,7 +136,7 @@ module.exports = function (sails) {
 	 * `pass` is declared in the socketConfig file.
 	 */
 
-	function createRedisConnection(port, host) {
+	function createRedisConnection(port, host, id) {
 
 		var socketConfig = sails.config.sockets;
 
@@ -155,6 +155,24 @@ module.exports = function (sails) {
 			client.select(socketConfig.db);
 		}
 
+		// If Redis connection ends, catch the error and retry
+		// until it comes back
+		 
+		client.on('ready', function() {
+			sails.log.debug('RedisClient::Events[ready]: [OK] Redis "' + id + '" is up. Connections: ', client.connections);
+		});
+
+		client.on('end', function() {
+		  sails.log.debug('RedisClient::Events[end]: "' + id + '" , Connected:', client.connected);
+		});
+
+		client.on('error', function (err) {
+			sails.log.error('RedisClient::Events[error]: "' + id + '" , ' + err);
+		    if (/ECONNREFUSED/g.test(err)) {
+		        sails.log.error('Waiting for "' + id + '" redis client to come back online. Connections:', client.connections);
+		    }
+		});
+
 		return client;
 	}