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

Support new option 'connect_timeout' to stop connection retries after the number of ms specified

Browse Source
This commit is contained in:
Owen Smith
2011-03-13 17:21:12 +00:00
committed by Matt Ranney
parent 8a2c1ad227
commit 025c2e938e
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
index.js
View File

@@ -26,7 +26,7 @@ parsers.push(require("./lib/parser/javascript"));
function RedisClient(stream, options) {
this.stream = stream;
this.options = options || {};
this.options = options = options || {};
this.connected = false;
this.ready = false;
@@ -38,9 +38,13 @@ function RedisClient(stream, options) {
this.command_queue = new Queue(); // holds sent commands to de-pipeline them
this.offline_queue = new Queue(); // holds commands issued but not able to be sent
this.commands_sent = 0;
this.retry_delay = 250; // inital reconnection delay
this.current_retry_delay = this.retry_delay;
this.retry_backoff = 1.7; // each retry waits current delay * retry_backoff
this.connect_timeout = false;
if (options.connect_timeout && !isNaN(options.connect_timeout) && options.connect_timeout > 0) {
this.connect_timeout = +options.connect_timeout;
}
this.retry_totaltime = 0;
this.retry_delay = 250;
this.retry_backoff = 1.7;
this.subscriptions = false;
this.monitoring = false;
this.closing = false;
@@ -164,6 +168,7 @@ RedisClient.prototype.on_connect = function () {
this.connections += 1;
this.command_queue = new Queue();
this.emitted_end = false;
this.retry_totaltime = 0;
this.retry_timer = null;
this.current_retry_delay = this.retry_time;
this.stream.setNoDelay();
@@ -351,6 +356,18 @@ RedisClient.prototype.connection_gone = function (why) {
if (exports.debug_mode) {
console.log("Retrying connection...");
}
self.retry_delay = self.retry_delay * self.retry_backoff;
self.retry_totaltime += self.retry_delay;
if (self.connect_timeout && self.retry_totaltime >= self.connect_timeout) {
self.retry_timer = null;
if (exports.debug_mode) {
console.log("Aborting connection attempt: Total timeout of " + self.connect_timeout + "ms exceeded.");
}
return;
}
self.stream.connect(self.port, self.host);
self.retry_timer = null;
}, this.current_retry_delay);