redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix auth emitting the error even though a callback is present

Browse Source 
Fix auth manipulating the returned error
And this is also removing some dead code
This commit is contained in:
Ruben Bridgewater
2015-09-14 22:13:43 +02:00
parent 1a06cfb6ec
commit ebbb0146b9
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
index.js
View File

@@ -206,20 +206,20 @@ RedisClient.prototype.do_auth = function () {
debug("Warning: Redis server does not require a password, but a password was supplied.");
err = null;
res = "OK";
} else if (self.auth_callback) {
self.auth_callback(err);
self.auth_callback = null;
} else {
return self.emit("error", new Error("Auth error: " + err.message));
self.emit("error", err);
return;
}
}
res = res.toString();
if (res !== "OK") {
return self.emit("error", new Error("Auth failed: " + res));
}
debug("Auth succeeded " + self.address + " id " + self.connection_id);
if (self.auth_callback) {
self.auth_callback(err, res);
self.auth_callback(null, res);
self.auth_callback = null;
}