fix(CLUSTER): fix cluster not disconnected when called disconnect method

Related issue: #277
redis · Apr 9, 2016 · e7b0b11 · e7b0b11
1 parent 055429b
commit e7b0b11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/cluster/index.js b/lib/cluster/index.js
@@ -57,7 +57,7 @@ function Cluster(startupNodes, options) {
 
   var _this = this;
   this.connectionPool.on('-node', function (redis) {
-    if (_this.subscriber === redis) {
+    if (_this.status === 'ready' && _this.subscriber === redis) {
       _this.selectSubscriber();
     }
     _this.emit('-node', redis);
@@ -193,6 +193,8 @@ Cluster.prototype.connect = function () {
  * @public
  */
 Cluster.prototype.disconnect = function (reconnect) {
+  this.setStatus('disconnecting');
+
   if (!reconnect) {
     this.manuallyClosing = true;
   }

diff --git a/lib/redis.js b/lib/redis.js
@@ -300,14 +300,20 @@ Redis.prototype.connect = function (callback) {
  * @public
  */
 Redis.prototype.disconnect = function (reconnect) {
+  this.setStatus('disconnecting');
+
   if (!reconnect) {
     this.manuallyClosing = true;
   }
   if (this.reconnectTimeout) {
     clearTimeout(this.reconnectTimeout);
     this.reconnectTimeout = null;
   }
-  this.connector.disconnect();
+  if (this.status === 'wait') {
+    eventHandler.closeHandler(this)();
+  } else {
+    this.connector.disconnect();
+  }
 };
 
 /**