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 #843 from fintura/reduce-timeout

Browse Source 
Reduce the reauthenticate timeout to 333ms
This commit is contained in:
Ruben Bridgewater
2015-09-16 05:43:07 +02:00
parent 57b5c7f76f 656706a263
commit bfcc0ae263
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@@ -168,7 +168,7 @@ RedisClient.prototype.on_error = function (msg) {
this.ready = false; this.ready = false;
this.emit("error", new Error(message)); this.emit("error", new Error(message));
// "error" events get turned into exceptions if they aren't listened for. If the user handled this error // "error" events get turned into exceptions if they aren't listened for. If the user handled this error
// then we should try to reconnect. // then we should try to reconnect.
this.connection_gone("error"); this.connection_gone("error");
}; };
@@ -186,11 +186,11 @@ RedisClient.prototype.do_auth = function () {
if (err) { if (err) {
/* istanbul ignore if: this is almost impossible to test */ /* istanbul ignore if: this is almost impossible to test */
if (loading.test(err.message)) { if (loading.test(err.message)) {
// if redis is still loading the db, it will not authenticate and everything else will fail // If redis is still loading the db, it will not authenticate and everything else will fail
debug("Redis still loading, trying to authenticate later"); debug("Redis still loading, trying to authenticate later");
setTimeout(function () { setTimeout(function () {
self.do_auth(); self.do_auth();
}, 2000); // TODO - magic number alert }, 333);
return; return;
} else if (noPasswordIsSet.test(err.message)) { } else if (noPasswordIsSet.test(err.message)) {
debug("Warning: Redis server does not require a password, but a password was supplied."); debug("Warning: Redis server does not require a password, but a password was supplied.");
@@ -213,7 +213,7 @@ RedisClient.prototype.do_auth = function () {
self.auth_callback = null; self.auth_callback = null;
} }
// now we are really connected // Now we are really connected
self.emit("connect"); self.emit("connect");
self.initialize_retry_vars(); self.initialize_retry_vars();