Don't attempt to connect to master while initialization is in progress

Author: tanguylebarzic

index.js

@@ -69,8 +69,17 @@ function RedisClient(stream, options) {
 
     this.old_state = null;
 
-    var self = this;
+    if(this.stream){
+        this.initialize_stream_listeners();
+    }
 
+    events.EventEmitter.call(this);
+}
+util.inherits(RedisClient, events.EventEmitter);
+exports.RedisClient = RedisClient;
+
+RedisClient.prototype.initialize_stream_listeners = function () {
+    var self = this;
     this.stream.on("connect", function () {
         self.on_connect();
     });
@@ -95,11 +104,7 @@ function RedisClient(stream, options) {
         self.should_buffer = false;
         self.emit("drain");
     });
-
-    events.EventEmitter.call(this);
-}
-util.inherits(RedisClient, events.EventEmitter);
-exports.RedisClient = RedisClient;
+};
 
 RedisClient.prototype.initialize_retry_vars = function () {
     this.retry_timer = null;
@@ -468,6 +473,12 @@ RedisClient.prototype.connection_gone = function (why) {
 };
 
 RedisClient.prototype.forceReconnectionAttempt = function (){
+    if(!this.stream){
+        this.stream = net.createConnection(this.port, this.host);
+        this.initialize_stream_listeners();
+        return;
+    }
+
     clearTimeout(this.retry_timer);
     this.initialize_retry_vars();
     this.connection_gone();
@@ -1098,11 +1109,20 @@ RedisClient.prototype.eval = RedisClient.prototype.EVAL = function () {
 
 
 exports.createClient = function (port_arg, host_arg, options) {
-    var port = port_arg || default_port,
-        host = host_arg || default_host,
-        redis_client, net_client;
+    var redis_client;
+    var net_client;
+
+    var port = port_arg,
+        host = host_arg;
+
+    options = options || {};
 
-    net_client = net.createConnection(port, host);
+    if(options.allowNoSocket !== true || (port_arg !== null && host_arg !== null)){
+        host = host || default_host;
+        port = port || default_port;
+
+        net_client = net.createConnection(port, host);
+    }
 
     redis_client = new RedisClient(net_client, options);
 

sentinel.js

@@ -24,7 +24,10 @@ function reply_to_object(reply) {
 
 function RedisMetaClient(masterName, startingSentinels) {
     this.healthy = false;
-    this.master = null;
+    this.master = {
+        host: null,
+        port: null
+    };
     this.masterClientId = 0;
     this.masterClients = [];
     this.masterName = masterName;
@@ -458,6 +461,8 @@ RedisMetaClient.prototype.masterAvailable = function(availableMaster) {
 };
 
 RedisMetaClient.prototype.createMasterClient = function(options) {
+    options = options || {};
+    options.allowNoSocket = true;
     var client = RedisSingleClient.createClient(this.master.port, this.master.host, options);
     var id = ++this.masterClientId;
     var self = this;