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

Merge pull request #101 from danmaz74/master

Browse Source 
Fix bug with authentication and LOADING error response.
This commit is contained in:
Matt Ranney
2011-06-30 11:19:20 -07:00
parent 6e5112d664 719d4f74cc
commit 13914295a6
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
index.js
View File

@@ -158,13 +158,25 @@ RedisClient.prototype.on_connect = function () {
this.stream.setTimeout(0); this.stream.setTimeout(0);
if (this.auth_pass) { if (this.auth_pass) {
var self = this;
// if redis is still loading the db, it will not authenticate and everything else will fail
function cmd_do_auth() {
if (exports.debug_mode) { if (exports.debug_mode) {
console.log("Sending auth to " + this.host + ":" + this.port + " fd " + this.stream.fd); console.log("Sending auth to " + self.host + ":" + self.port + " fd " + self.stream.fd);
} }
self.send_anyway = true; self.send_anyway = true;
self.send_command("auth", this.auth_pass, function (err, res) { self.send_command("auth", self.auth_pass, function (err, res) {
if (err) { if (err) {
return self.emit("error", "Auth error: " + err); if (err.toString().match("LOADING")) {
// still loading, try to authenticate later
console.log("Redis still loading, trying to authenticate later");
setTimeout(cmd_do_auth,2000);
return;
}
else return self.emit("error", "Auth error: " + err);
} }
if (res.toString() !== "OK") { if (res.toString() !== "OK") {
return self.emit("error", "Auth failed: " + res.toString()); return self.emit("error", "Auth failed: " + res.toString());
@@ -176,18 +188,34 @@ RedisClient.prototype.on_connect = function () {
self.auth_callback(err, res); self.auth_callback(err, res);
self.auth_callback = null; self.auth_callback = null;
} }
// now we are really connected
self.emit("connect");
if (self.options.no_ready_check) {
self.ready = true;
self.send_offline_queue();
} else {
self.ready_check();
}
}); });
self.send_anyway = false; self.send_anyway = false;
} }
this.emit("connect"); cmd_do_auth();
if (this.options.no_ready_check) {
this.ready = true;
this.send_offline_queue();
} else { } else {
this.ready_check();
this.emit("connect");
if (this.options.no_ready_check) {
this.ready = true;
this.send_offline_queue();
} else {
this.ready_check();
}
} }
}; };
RedisClient.prototype.ready_check = function () { RedisClient.prototype.ready_check = function () {