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

Try exactly until the connection timeout has been reached

Browse Source 
Fixes #587
This commit is contained in:
Ruben Bridgewater
2015-09-10 18:40:43 +02:00
parent a9e7663aff
commit 3c2ba8c373
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
index.js
View File

@@ -423,7 +423,7 @@ RedisClient.prototype.connection_gone = function (why) {
return;
}
if (this.retry_totaltime > this.connect_timeout) {
if (this.retry_totaltime >= this.connect_timeout) {
this.emit('error', new Error("Redis connection in broken state: connection timeout exceeded."));
return;
}
@@ -459,11 +459,12 @@ RedisClient.prototype.connection_gone = function (why) {
return;
}
var nextDelay = Math.floor(this.retry_delay * this.retry_backoff);
if (this.retry_max_delay !== null && nextDelay > this.retry_max_delay) {
this.retry_delay = Math.floor(this.retry_delay * this.retry_backoff);
if (this.retry_max_delay !== null && this.retry_delay > this.retry_max_delay) {
this.retry_delay = this.retry_max_delay;
} else {
this.retry_delay = nextDelay;
} else if (this.retry_totaltime + this.retry_delay > this.connect_timeout) {
// Do not exceed the maximum
this.retry_delay = this.connect_timeout - this.retry_totaltime;
}
debug("Retry connection in " + this.retry_delay + " ms");