From e03d40957efa77eb4e22ba4031627165cd1f02bc Mon Sep 17 00:00:00 2001
From: Patrick Mooney <patrick.f.mooney@gmail.com>
Date: Thu, 24 Oct 2013 21:04:50 -0500
Subject: [PATCH 1/2] Fix some ClientPool event handling

Emit connectTimeout and error events from ClientPool as Client would.
---
 lib/client/client.js | 13 +++++++++----
 lib/client/pool.js   | 11 +++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/client/client.js b/lib/client/client.js
index 9dda196..8cd2d34 100644
--- a/lib/client/client.js
+++ b/lib/client/client.js
@@ -163,6 +163,11 @@ function setupSocket(socket, opts) {
   socket.on('error', function onError(err) {
     if (log.trace())
       log.trace({err: err}, 'error event: %s', new Error().stack);
+ 
+    if (opts.connectTimer) {
+      clearTimeout(opts.connectTimer);
+      opts.connectTimer = false;
+    }
 
     if (opts.listeners('error').length)
       opts.emit('error', err);
@@ -706,11 +711,11 @@ Client.prototype._connect = function _connect() {
   var proto = this.secure ? tls : net;
   var self = this;
   var socket = null;
-  var timer = false;
+  this.connectTimer = false;
 
   function onConnect() {
-        if (timer)
-      clearTimeout(timer);
+    if (self.connectTimer)
+      clearTimeout(self.connectTimer);
 
     socket.removeListener('connect', onConnect);
     socket.removeListener('secureConnect', onConnect);
@@ -732,7 +737,7 @@ Client.prototype._connect = function _connect() {
   setupSocket(socket, this);
 
   if (this.connectTimeout) {
-    timer = setTimeout(function onConnectTimeout() {
+    this.connectTimer = setTimeout(function onConnectTimeout() {
       if (!socket || !socket.readable || !socket.writeable) {
         socket.destroy();
 
diff --git a/lib/client/pool.js b/lib/client/pool.js
index aa2c601..4e7900e 100644
--- a/lib/client/pool.js
+++ b/lib/client/pool.js
@@ -31,7 +31,7 @@ var RETURN_VAL_OPS = [
 
 ///--- Internal Functions
 
-function createPool(options) {
+function createPool(options, self) {
   assert.ok(options);
 
   return pooling.createPool({
@@ -46,9 +46,16 @@ function createPool(options) {
 
       client.on('error', function (err) {
         client.removeAllListeners('connect');
+        client.removeAllListeners('connectTimeout');
+        self.emit('error', err);
         return callback(err);
       });
 
+      client.on('connectTimeout', function () {
+        client.removeAllListeners('connect');
+        self.emit('connectTimeout');
+      });
+
       client.once('connect', function onConnect() {
         client.removeAllListeners('error');
 
@@ -118,7 +125,7 @@ function ClientPool(options) {
     url: options.url,
     tlsOptions: options.tlsOptions
   };
-  this.pool = createPool(options);
+  this.pool = createPool(options, this);
 }
 util.inherits(ClientPool, EventEmitter);
 module.exports = ClientPool;

From f5ba81dc38d0d321b31767df4a9ae4cb0996b322 Mon Sep 17 00:00:00 2001
From: Patrick Mooney <patrick.f.mooney@gmail.com>
Date: Thu, 28 Nov 2013 14:08:17 -0600
Subject: [PATCH 2/2] Minor update to ClientPool event pass-through

- Allow event pass-through when performing ClientPool.bind
- Rename createPool parameter for better readability
- Fix jsstyle error
---
 lib/client/client.js | 2 +-
 lib/client/pool.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/client/client.js b/lib/client/client.js
index 8cd2d34..e9414d5 100644
--- a/lib/client/client.js
+++ b/lib/client/client.js
@@ -163,7 +163,7 @@ function setupSocket(socket, opts) {
   socket.on('error', function onError(err) {
     if (log.trace())
       log.trace({err: err}, 'error event: %s', new Error().stack);
- 
+
     if (opts.connectTimer) {
       clearTimeout(opts.connectTimer);
       opts.connectTimer = false;
diff --git a/lib/client/pool.js b/lib/client/pool.js
index 4e7900e..571fbaf 100644
--- a/lib/client/pool.js
+++ b/lib/client/pool.js
@@ -31,7 +31,7 @@ var RETURN_VAL_OPS = [
 
 ///--- Internal Functions
 
-function createPool(options, self) {
+function createPool(options, clientpool) {
   assert.ok(options);
 
   return pooling.createPool({
@@ -47,13 +47,13 @@ function createPool(options, self) {
       client.on('error', function (err) {
         client.removeAllListeners('connect');
         client.removeAllListeners('connectTimeout');
-        self.emit('error', err);
+        clientpool.emit('error', err);
         return callback(err);
       });
 
       client.on('connectTimeout', function () {
         client.removeAllListeners('connect');
-        self.emit('connectTimeout');
+        clientpool.emit('connectTimeout');
       });
 
       client.once('connect', function onConnect() {
@@ -248,7 +248,7 @@ ClientPool.prototype.bind = function bind(dn, creds, controls, callback) {
   self.options.bindControls = null;
 
   return this.pool.shutdown(function () {
-    self.pool = createPool(self.options);
+    self.pool = createPool(self.options, self);
 
     return self.pool.acquire(function onAcquire(err, client) {
       if (err)