post-merge fixes

index.js

@@ -53,6 +53,7 @@ function RedisClient(stream, options, cnxOptions) {
         this.write = this.writeStream;
     }
 
+    this.options = options;
     this.stream = stream;
     this.connection_id = ++connection_id;
     this.connected = false;
@@ -95,7 +96,6 @@ function RedisClient(stream, options, cnxOptions) {
     this.parser_module = null;
     this.selected_db = null; // Save the selected db here, used when reconnecting
     this.old_state = null;
-    this.options = options;
 
     if (options.failover) failover.prepareOptions(this);
 
@@ -592,7 +592,7 @@ function _return_error(client, err, command_obj) {
         err.code = match[1];
     }
 
-    this.emit_drain_idle(queue_len);
+    client.emit_drain_idle(queue_len);
 
     if (command_obj.callback) {
         command_obj.callback(err);

lib/failover.js

@@ -1,5 +1,13 @@
 'use strict';
 
+
+function addAuth(auth_pass, toConnection) {
+    if (toConnection.auth_pass.indexOf(auth_pass) === -1) {
+        toConnection.auth_pass.push(auth_pass);
+    }
+}
+
+
 function prepareOptions(client) {
     var connections = [ { connectionOption: client.connectionOption, auth_pass: [client.options.auth_pass] } ];
 
@@ -44,14 +52,6 @@ function prepareOptions(client) {
         return options;
     }
 
-    function addAuth(auth_pass, toConnection) {
-        if (toConnection.auth_pass.indexOf(auth_pass) === -1) {
-            toConnection.auth_pass.push(auth_pass);
-        } else {
-            console.error('Same password used more than once');
-        }
-    }
-
     function equal(a, b) {
         var keys = Object.keys(a);
         if (keys.length !== Object.keys(b).length) return false;
@@ -81,6 +81,7 @@ function nextConnection(client) {
 function getPasswords(client) {
     var fo = client._failover;
     var connection = fo.connections[fo.connectionIndex];
+    addAuth(client.auth_pass, connection);
     var passwords = connection.auth_pass;
     return passwords.filter(function(p) {return p;});
 }