Lints Pool.js

Author: dresende

lib/Pool.js

@@ -1,8 +1,8 @@
-
-var Mysql        = require('../');
+var mysql        = require('../');
 var Connection   = require('./Connection');
 
 module.exports = Pool;
+
 function Pool(options) {
   this.config = options.config;
   this.config.connectionConfig.pool = this;
@@ -13,81 +13,94 @@ function Pool(options) {
   this._closed           = false;
 }
 
-Pool.prototype.getConnection = function(cb) {
+Pool.prototype.getConnection = function (cb) {
   if (this._closed) {
-    cb(new Error('Pool is closed.'));
-    return;
+    return cb(new Error('Pool is closed.'));
   }
 
+  var connection;
+
   if (this._freeConnections.length > 0) {
-    var connection = this._freeConnections[0];
-    this._freeConnections.shift();
-    cb(null, connection);
-  } else if (this.config.connectionLimit == 0 || this._allConnections.length < this.config.connectionLimit) {
-    var self       = this;
-    var connection = this._createConnection();
+    connection = this._freeConnections.shift();
+
+    return cb(null, connection);
+  }
+
+  if (this.config.connectionLimit === 0 || this._allConnections.length < this.config.connectionLimit) {
+    connection = this._createConnection();
+
     this._allConnections.push(connection);
-    connection.connect(function(err) {
-      if (self._closed) {
-        cb(new Error('Pool is closed.'));
+
+    return connection.connect(function(err) {
+      if (this._closed) {
+        return cb(new Error('Pool is closed.'));
       }
-      else if (err) {
-        cb(err);
-      } else {
-        cb(null, connection);
+      if (err) {
+        return cb(err);
       }
-    });
-  } else if (this.config.waitForConnections) {
-    this._connectionQueue.push(cb);
-  } else {
-    cb(new Error('No connections available.'));
+
+      return cb(null, connection);
+    }.bind(this));
+  }
+
+  if (!this.config.waitForConnections) {
+    return cb(new Error('No connections available.'));
   }
+
+  this._connectionQueue.push(cb);
 };
 
-Pool.prototype.releaseConnection = function(connection) {
+Pool.prototype.releaseConnection = function (connection) {
+  var cb;
+
   if (connection._poolRemoved) {
     // The connection has been removed from the pool and is no longer good.
     if (this._connectionQueue.length) {
-      var cb = this._connectionQueue[0];
-      this._connectionQueue.shift();
+      cb = this._connectionQueue.shift();
+
       process.nextTick(this.getConnection.bind(this, cb));
     }
   } else if (this._connectionQueue.length) {
-    var cb = this._connectionQueue[0];
-    this._connectionQueue.shift();
+    cb = this._connectionQueue.shift();
+
     process.nextTick(cb.bind(null, null, connection));
   } else {
     this._freeConnections.push(connection);
   }
 };
 
-Pool.prototype.end = function(cb) {
+Pool.prototype.end = function (cb) {
   this._closed = true;
-  cb = cb || function(err) { if( err ) throw err; };
-  var self              = this;
-  var closedConnections = 0;
+
+  if (typeof cb != "function") {
+    cb = function (err) {
+      if (err) throw err;
+    };
+  }
+
   var calledBack        = false;
+  var closedConnections = 0;
+  var connection;
+
   var endCB = function(err) {
     if (calledBack) {
       return;
-    } else if (err) {
-      calledBack = true;
-      delete endCB;
-      cb(err);
-    } else if (++closedConnections >= self._allConnections.length) {
+    }
+
+    if (err || ++closedConnections >= this._allConnections.length) {
       calledBack = true;
       delete endCB;
-      cb();
+      return cb(err);
     }
-  };
+  }.bind(this);
 
-  if (this._allConnections.length == 0) {
-    endCB();
-    return;
+  if (this._allConnections.length === 0) {
+    return endCB();
   }
 
-  for (var i = 0; i < this._allConnections.length; ++i) {
-    var connection = this._allConnections[i];
+  for (var i = 0; i < this._allConnections.length; i++) {
+    connection = this._allConnections[i];
+
     connection.destroy = connection._realDestroy;
     connection.end     = connection._realEnd;
     connection.end(endCB);
@@ -98,7 +111,7 @@ Pool.prototype._createConnection = function() {
   var self = this;
   var connection = (this.config.createConnection)
     ? this.config.createConnection(this.config.connectionConfig)
-    : Mysql.createConnection(this.config.connectionConfig);
+    : mysql.createConnection(this.config.connectionConfig);
 
   connection._realEnd = connection.end;
   connection.end      = function(cb) {
@@ -136,14 +149,18 @@ Pool.prototype._handleConnectionError = function(connection) {
 };
 
 Pool.prototype._removeConnection = function(connection) {
+  var i;
+
   connection._poolRemoved = true;
-  for (var i = 0; i < this._allConnections.length; ++i) {
+
+  for (i = 0; i < this._allConnections.length; i++) {
     if (this._allConnections[i] === connection) {
       this._allConnections.splice(i, 1);
       break;
     }
   }
-  for (var i = 0; i < this._freeConnections.length; ++i) {
+
+  for (i = 0; i < this._freeConnections.length; i++) {
     if (this._freeConnections[i] === connection) {
       this._freeConnections.splice(i, 1);
       break;
@@ -152,5 +169,6 @@ Pool.prototype._removeConnection = function(connection) {
 
   connection.end     = connection._realEnd;
   connection.destroy = connection._realDestroy;
+
   this.releaseConnection(connection);
 };