Merge pull request #45 from NextZeus/master

upgrade pomelo & generic-pool to last version
NetEase · Feb 17, 2017 · 5e12f10 · 5e12f10
2 parents e98c2df + 09f7d6c
commit 5e12f10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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.5"
   , "async": ">=0.0.1"
   , "socket.io-client" : ">=0.9.6"
   , "pomelo-aoi" : ">=0.3.4"

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,8 +7,8 @@
     , "everyauth": "0.3.0"
     , "connect": ">=0.0.1"
     , "ejs": "0.8.3"
-    , "generic-pool": ">=1.0.9"
-    , "mysql": ">=2.0"
+    , "generic-pool": "*"
+    , "mysql": "*"
   }
 }