[reconnect] fixes redis#1138

alexandre-abrioux · May 27, 2020 · a373309 · a373309
1 parent 6f5a0c1
commit a373309
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/cluster/index.ts b/lib/cluster/index.ts
@@ -316,7 +316,7 @@ class Cluster extends EventEmitter {
     if (!reconnect) {
       this.manuallyClosing = true;
     }
-    if (this.reconnectTimeout) {
+    if (this.reconnectTimeout && !reconnect) {
       clearTimeout(this.reconnectTimeout);
       this.reconnectTimeout = null;
       debug("Canceled reconnecting attempts");

diff --git a/lib/redis/index.ts b/lib/redis/index.ts
@@ -278,10 +278,9 @@ Redis.prototype.connect = function (callback) {
 
     this.condition = {
       select: options.db,
-      auth:
-        options.username
-          ? [options.username, options.password]
-          : options.password,
+      auth: options.username
+        ? [options.username, options.password]
+        : options.password,
       subscriber: false,
     };
 
@@ -380,7 +379,7 @@ Redis.prototype.disconnect = function (reconnect) {
   if (!reconnect) {
     this.manuallyClosing = true;
   }
-  if (this.reconnectTimeout) {
+  if (this.reconnectTimeout && !reconnect) {
     clearTimeout(this.reconnectTimeout);
     this.reconnectTimeout = null;
   }