fix: won't emit error again when password is wrong

redis · May 7, 2016 · dfdebfe · dfdebfe
1 parent 3561fab
commit dfdebfe
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/redis/event_handler.js b/lib/redis/event_handler.js
@@ -11,10 +11,12 @@ exports.connectHandler = function (self) {
     self.resetCommandQueue();
 
     // AUTH command should be processed before any other commands
+    var flushed = false;
     if (self.condition.auth) {
       self.auth(self.condition.auth, function (err) {
         if (err) {
           if (err.message.indexOf('no password is set') === -1) {
+            flushed = true;
             self.flushQueue(err);
             self.silentEmit('error', err);
             self.disconnect(true);
@@ -38,9 +40,11 @@ exports.connectHandler = function (self) {
     if (self.options.enableReadyCheck) {
       self._readyCheck(function (err, info) {
         if (err) {
-          self.flushQueue(new Error('Ready check failed: ' + err.message));
-          self.silentEmit('error', err);
-          self.disconnect(true);
+          if (!flushed) {
+            self.flushQueue(new Error('Ready check failed: ' + err.message));
+            self.silentEmit('error', err);
+            self.disconnect(true);
+          }
         } else {
           self.serverInfo = info;
           if (self.connector.check(info)) {