add ZK connection timemout

mcavage · Sep 5, 2012 · d72d8dd · d72d8dd
1 parent 1746168
commit d72d8dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -5,6 +5,7 @@ var path = require('path');
 var util = require('util');
 
 var vasync = require('vasync');
+var verror = require('verror');
 var ZK = require('zookeeper');
 
 var assert = require('./assert');
@@ -67,6 +68,8 @@ function ZKClient(options) {
                 assertNumber('options.timeout', options.timeout);
         if (options.pollInterval)
                 assertNumber('options.pollInterval', options.pollInterval);
+        if (options.connectTimeout)
+                assertNumber('options.connectTimeout', options.connectTimeout);
 
         EventEmitter.call(this);
 
@@ -92,6 +95,12 @@ function ZKClient(options) {
         });
 
         this.timeout = options.timeout;
+        this.connectTimeout = options.connectTimeout || 2000;
+
+        this.connectTimeoutId = setTimeout(function() {
+                throw new verror.VError('could not connect to ZK');
+        }, self.connectTimeout);
+
         this.zk = new ZK({
                 connect: _connect.join(','),
                 timeout: self.timeout,
@@ -156,6 +165,7 @@ ZKClient.prototype.connect = function connect(callback) {
                         self.emit('error', e);
                         callback(e);
                 } else {
+                        clearTimeout(self.connectTimeoutId);
                         log.trace('connected');
                         self.pollState();
                         self.emit('connect');

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
                 "bunyan": "0.11.0",
                 "node-uuid": "1.3.3",
                 "vasync": "1.3.1",
+                "verror": "1.3.3",
                 "zookeeper": "git://github.com/mcavage/node-zookeeper.git#8a28f8c"
         },
         "devDependencies": {