Introduce utils, for methods shared between client.js and sentinel.js

Author: Tanguy Le Barzic

index.js

@@ -2,6 +2,7 @@
 
 var net = require("net"),
     util = require("./lib/util"),
+    reply_to_object = require("./lib/utils").reply_to_object,
     Queue = require("./lib/queue"),
     to_array = require("./lib/to_array"),
     events = require("events"),
@@ -542,23 +543,6 @@ function try_callback(callback, reply) {
     }
 }
 
-// hgetall converts its replies to an Object.  If the reply is empty, null is returned.
-function reply_to_object(reply) {
-    var obj = {}, j, jl, key, val;
-
-    if (reply.length === 0) {
-        return null;
-    }
-
-    for (j = 0, jl = reply.length; j < jl; j += 2) {
-        key = reply[j].toString();
-        val = reply[j + 1];
-        obj[key] = val;
-    }
-
-    return obj;
-}
-
 function reply_to_strings(reply) {
     var i;
 

lib/utils.js

@@ -0,0 +1,20 @@
+// hgetall converts its replies to an Object.  If the reply is empty, null is returned.
+function reply_to_object(reply) {
+    var obj = {}, j, jl, key, val;
+
+    if (reply.length === 0) {
+        return null;
+    }
+
+    for (j = 0, jl = reply.length; j < jl; j += 2) {
+        key = reply[j].toString();
+        val = reply[j + 1];
+        obj[key] = val;
+    }
+
+    return obj;
+}
+
+module.exports = {
+    reply_to_object: reply_to_object
+};

sentinel.js

@@ -1,26 +1,10 @@
 var events = require("events");
+var reply_to_object = require("./lib/utils").reply_to_object;
 var util = require("util");
 
-exports.debug_mode = true;
-
 var RedisSingleClient = require("./index");
 
-function reply_to_object(reply) {
-    var obj = {},
-        j, jl, key, val;
-
-    if(reply.length === 0) {
-        return null;
-    }
-
-    for(j = 0, jl = reply.length; j < jl; j += 2) {
-        key = reply[j].toString();
-        val = reply[j + 1];
-        obj[key] = val;
-    }
-
-    return obj;
-}
+exports.debug_mode = true;
 
 function RedisMetaClient(masterName, startingSentinels) {
     this.healthy = false;
@@ -193,8 +177,6 @@ RedisMetaClient.prototype.initSentinelConnection = function(sentinelConfig) {
         var parts = message.split(' ');
         switch(channel) {
         case '+reset-master':
-            console.log(channel);
-            console.log(message);
             break;
 
         case '+slave':
@@ -323,18 +305,22 @@ RedisMetaClient.prototype.initSentinelConnection = function(sentinelConfig) {
 
 
         default:
-            console.log(channel + "::" + message);
-            break;
+            if(exports.debug_mode){
+                console.log(channel + "::" + message);
+                break;
+            }
         }
     });
 
+    // TODO: seems a bit rude
     sentinelClient.on('error', function() {
         self.removeSentinel(sentinelConfig);
     });
 
     sentinelClient.psubscribe('*');
 };
 
+// There are surely other things to do here
 RedisMetaClient.prototype.quit = function(){
     clearTimeout(this.cleanMessagesReceived);
 };
@@ -460,12 +446,14 @@ RedisMetaClient.prototype.masterAvailable = function(availableMaster) {
     this.emit('healthyChange', true);
 };
 
+// Return a RedisSingleCLient pointing to the master (or to nothing if there is no master yet)
 RedisMetaClient.prototype.createMasterClient = function(options) {
     options = options || {};
     options.allowNoSocket = true;
     var client = RedisSingleClient.createClient(this.master.port, this.master.host, options);
     var self = this;
     var connection_id = client.connection_id;
+
     client.on('end', function(){
         for (var i = 0, len = self.masterClients.length; i < len; i++) {
             var cl = self.masterClients[i];
@@ -474,7 +462,9 @@ RedisMetaClient.prototype.createMasterClient = function(options) {
             }
         }
     });
+
     this.masterClients.push({config: this.master, client: client});
+    
     return client;
 };