Merge package.json

lib/dialects/mysql/connector-manager.js

@@ -19,7 +19,9 @@ module.exports = (function() {
     this.poolCfg = Utils._.defaults(this.config.pool, {
     this.poolCfg = Utils._.defaults(this.config.pool, {
       maxConnections: 10,
       maxConnections: 10,
       minConnections: 0,
       minConnections: 0,
-      maxIdleTime: 1000
+      maxIdleTime: 1000,
+      handleDisconnects: false,
+      validate: validateConnection
     });
     });
     this.pendingQueries = 0;
     this.pendingQueries = 0;
     this.useReplicaton = !!config.replication;
     this.useReplicaton = !!config.replication;
@@ -83,6 +85,7 @@ module.exports = (function() {
           destroy: function(client) {
           destroy: function(client) {
             disconnect.call(self, client)
             disconnect.call(self, client)
           },
           },
+          validate: self.poolCfg.validate,
           max: self.poolCfg.maxConnections,
           max: self.poolCfg.maxConnections,
           min: self.poolCfg.minConnections,
           min: self.poolCfg.minConnections,
           idleTimeoutMillis: self.poolCfg.maxIdleTime
           idleTimeoutMillis: self.poolCfg.maxIdleTime
@@ -98,6 +101,7 @@ module.exports = (function() {
           destroy: function(client) {
           destroy: function(client) {
             disconnect.call(self, client)
             disconnect.call(self, client)
           },
           },
+          validate: self.poolCfg.validate,
           max: self.poolCfg.maxConnections,
           max: self.poolCfg.maxConnections,
           min: self.poolCfg.minConnections,
           min: self.poolCfg.minConnections,
           idleTimeoutMillis: self.poolCfg.maxIdleTime
           idleTimeoutMillis: self.poolCfg.maxIdleTime
@@ -115,6 +119,7 @@ module.exports = (function() {
         },
         },
         max: self.poolCfg.maxConnections,
         max: self.poolCfg.maxConnections,
         min: self.poolCfg.minConnections,
         min: self.poolCfg.minConnections,
+        validate: self.poolCfg.validate,
         idleTimeoutMillis: self.poolCfg.maxIdleTime
         idleTimeoutMillis: self.poolCfg.maxIdleTime
       })
       })
     }
     }
@@ -247,10 +252,25 @@ module.exports = (function() {
     connection.query("SET time_zone = '+0:00'");
     connection.query("SET time_zone = '+0:00'");
     // client.setMaxListeners(self.maxConcurrentQueries)
     // client.setMaxListeners(self.maxConcurrentQueries)
     this.isConnecting = false
     this.isConnecting = false
-
+    if (config.pool.handleDisconnects) {
+      handleDisconnect(this.pool, connection)
+    }
     done(null, connection)
     done(null, connection)
   }
   }
 
 
+  var handleDisconnect = function(pool, client) {
+    client.on('error', function(err) {
+      if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
+        throw err
+      }
+      pool.destroy(client)
+    })
+  }
+
+  var validateConnection = function(client) {
+    return client && client.state != 'disconnected'
+  }
+
   var enqueue = function(queueItem, options) {
   var enqueue = function(queueItem, options) {
     options = options || {}
     options = options || {}
     if (this.activeQueue.length < this.maxConcurrentQueries) {
     if (this.activeQueue.length < this.maxConcurrentQueries) {
@@ -336,4 +356,4 @@ module.exports = (function() {
   }
   }
 
 
   return ConnectorManager
   return ConnectorManager
-})()
+})()
\ No newline at end of file

lib/emitters/custom-event-emitter.js

@@ -2,9 +2,20 @@ var util           = require("util")
   , EventEmitter   = require("events").EventEmitter
   , EventEmitter   = require("events").EventEmitter
   , proxyEventKeys = ['success', 'error', 'sql']
   , proxyEventKeys = ['success', 'error', 'sql']
 
 
+
+var bindToProcess = function(fct) {
+  if (fct) {
+      if(process.domain) {
+          return process.domain.bind(fct);
+      }
+  }
+
+  return fct;
+};
+
 module.exports = (function() {
 module.exports = (function() {
   var CustomEventEmitter = function(fct) {
   var CustomEventEmitter = function(fct) {
-    this.fct = fct
+    this.fct = bindToProcess(fct);
   }
   }
   util.inherits(CustomEventEmitter, EventEmitter)
   util.inherits(CustomEventEmitter, EventEmitter)
 
 
@@ -14,14 +25,14 @@ module.exports = (function() {
         this.fct.call(this, this)
         this.fct.call(this, this)
       }
       }
     }.bind(this))
     }.bind(this))
-    
+
     return this
     return this
   }
   }
 
 
   CustomEventEmitter.prototype.success =
   CustomEventEmitter.prototype.success =
   CustomEventEmitter.prototype.ok =
   CustomEventEmitter.prototype.ok =
   function(fct) {
   function(fct) {
-    this.on('success', fct)
+    this.on('success', bindToProcess(fct))
     return this
     return this
   }
   }
 
 
@@ -29,13 +40,14 @@ module.exports = (function() {
   CustomEventEmitter.prototype.fail =
   CustomEventEmitter.prototype.fail =
   CustomEventEmitter.prototype.error =
   CustomEventEmitter.prototype.error =
   function(fct) {
   function(fct) {
-    this.on('error', fct)
+    this.on('error', bindToProcess(fct))
     return this;
     return this;
   }
   }
 
 
   CustomEventEmitter.prototype.done =
   CustomEventEmitter.prototype.done =
   CustomEventEmitter.prototype.complete =
   CustomEventEmitter.prototype.complete =
   function(fct) {
   function(fct) {
+    fct = bindToProcess(fct);
     this.on('error', function(err) { fct(err, null) })
     this.on('error', function(err) { fct(err, null) })
         .on('success', function(result) { fct(null, result) })
         .on('success', function(result) { fct(null, result) })
     return this
     return this
@@ -52,3 +64,4 @@ module.exports = (function() {
 
 
   return CustomEventEmitter;
   return CustomEventEmitter;
 })()
 })()
+

package.json

@@ -35,9 +35,10 @@
     "validator": "1.1.1",
     "validator": "1.1.1",
     "moment": "~1.7.0",
     "moment": "~1.7.0",
     "commander": "~0.6.0",
     "commander": "~0.6.0",
-    "generic-pool": "1.0.9",
     "dottie": "0.0.6-1",
     "dottie": "0.0.6-1",
-    "toposort-class": "0.1.4"
+    "toposort-class": "0.1.4",
+    "generic-pool": "2.0.3",
+    "dottie": "0.0.6-1"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "jasmine-node": "1.5.0",
     "jasmine-node": "1.5.0",