Merge pull request #2728 from dejanr/master

Sequelize.close should close all connections once pool is being drained

lib/dialects/abstract/connection-manager.js

@@ -44,8 +44,12 @@ ConnectionManager = function(dialect, sequelize) {
 };
 
 ConnectionManager.prototype.onProcessExit = function() {
+  var self = this;
+
   if (this.pool) {
-    this.pool.drain();
+    this.pool.drain(function() {
+      self.pool.destroyAllNow();
+    });
   }
 };
 
@@ -116,9 +120,14 @@ ConnectionManager.prototype.initPools = function () {
       destroy: function(connection) {
         return self.pool[connection.queryType].destroy(connection);
       },
-      drain: function() {
-        self.pool.read.drain();
-        self.pool.write.drain();
+      destroyAllNow: function() {
+        self.pool.read.destroyAllNow();
+        self.pool.write.destroyAllNow();
+      },
+      drain: function(cb) {
+        self.pool.write.drain(function() {
+          self.pool.read.drain(cb);
+        });
       },
       read: Pooling.Pool({
         name: 'sequelize-connection-read',