upgrade web-server package.json

upgrade generic-pool version to last
NetEase · Feb 17, 2017 · 09f7d6c · 09f7d6c
1 parent d7d95c8
commit 09f7d6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web-server/lib/dao/mysql/dao-pool.js b/web-server/lib/dao/mysql/dao-pool.js
@@ -1,5 +1,6 @@
 var _poolModule = require('generic-pool');
 var mysqlConfig = require('../../../../shared/config/mysql');
+var mysql = require('mysql');
 
 var env = process.env.NODE_ENV || 'development';
 if(mysqlConfig[env]) {
@@ -10,10 +11,9 @@ if(mysqlConfig[env]) {
  * Create mysql connection pool.
  */
 var createMysqlPool = function(){
-  return _poolModule.Pool({
+  return _poolModule.createPool({
     name     : 'mysql',
     create   : function(callback) {
-      var mysql = require('mysql');
       var client = mysql.createConnection({
         host: mysqlConfig.host,
         user: mysqlConfig.user,

diff --git a/web-server/package.json b/web-server/package.json
@@ -7,7 +7,7 @@
     , "everyauth": "0.3.0"
     , "connect": ">=0.0.1"
     , "ejs": "0.8.3"
-    , "generic-pool": ">=1.0.9"
+    , "generic-pool": "*"
     , "mysql": "*"
   }
 }