Merge remote branch 'Tim_Smart/retry-loop'

shift · Sep 18, 2010 · 243f638 · 243f638
2 parents 715b097 + b55d7c6
commit 243f638
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -304,6 +304,9 @@ function RedisClient(stream) {
     var self = this;
 
     this.stream.on("connect", function () {
+        if (exports.debug_mode) {
+            console.log("Stream connected");
+        }
         self.connected = true;
         self.connections += 1;
         self.command_queue = new Queue();
@@ -319,6 +322,7 @@ function RedisClient(stream) {
             console.log("Redis reply parser error: " + err.stack);
         });
 
+        self.retry_timer = null;
         self.retry_delay = 250;
         self.stream.setNoDelay();
         self.stream.setTimeout(0);
@@ -391,7 +395,6 @@ RedisClient.prototype.connection_gone = function () {
         if (exports.debug_mode) {
             console.log("Retrying conneciton...");
         }
-        self.retry_timer = null;
         self.retry_delay = self.retry_delay * self.retry_backoff;
         self.stream.destroy();
         self.stream.connect(self.port, self.host);