upgrade pomelo version & generic-pool version

NetEase · Feb 17, 2017 · 87f5dbd · 87f5dbd
1 parent e98c2df
commit 87f5dbd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/game-server/app/dao/mysql/dao-pool.js b/game-server/app/dao/mysql/dao-pool.js
@@ -1,14 +1,14 @@
 var _poolModule = require('generic-pool');
-
+var mysql = require('mysql');
 /*
  * Create mysql connection pool.
  */
 var createMysqlPool = function(app) {
 	var mysqlConfig = app.get('mysql');
-	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/game-server/package.json b/game-server/package.json
@@ -6,9 +6,9 @@
   "express": "2.5.2"
   , "connect": ">=0.0.1"
   , "socket.io": ">=0.9.6"
-  , "generic-pool": ">=1.0.9"
+  , "generic-pool": "*"
   , "mysql": ">=2.0"
-  , "pomelo": "~0.8.0"
+  , "pomelo": "~2.2.0"
   , "async": ">=0.0.1"
   , "socket.io-client" : ">=0.9.6"
   , "pomelo-aoi" : ">=0.3.4"

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