Merge branch 'master' of https://github.com/qiankanglai/pomelo

NetEase · Jun 21, 2014 · 6e3e316 · 6e3e316
2 parents c5d353f + 7578eba
commit 6e3e316
Show file tree

Hide file tree

Showing 30 changed files with 183 additions and 78 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,9 @@
+1.0.0 / 2014-06-19
+=================
+* mqtt connector
+* support ie6,7,8 with sioconnector
+* support hot update partially
+
 1.0.0-pre / 2014-05-16
 =================
 * add udpconnector

diff --git a/gruntfile.js b/gruntfile.js
@@ -7,14 +7,15 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', 'test/util/*.js', 'test/*.js'];
+  'test/remote/*.js', 'test/service/*.js', 'test/modules/*.js', 'test/util/*.js', 'test/*.js'];
 
   // Project configuration.
   grunt.initConfig({
     mochaTest: {
        test: {
         options: {
           reporter: 'spec',
+          timeout: 5000,
           require: 'coverage/blanket'
         },
         src: src

diff --git a/lib/common/service/channelService.js b/lib/common/service/channelService.js
@@ -426,7 +426,7 @@ var sendMessageByGroup = function(channelService, route, msg, groups, opts, cb)
   var sendMessage = function(sid) {
     return (function() {
       if(sid === app.serverId) {
-        channelService.channelRemote[method](route, msg, groups[sid], opts, rpcCB);
+        channelService.channelRemote[method](route, msg, groups[sid], opts, rpcCB(sid));
       } else {
         app.rpcInvoke(sid, {namespace: namespace, service: service,
           method: method, args: [route, msg, groups[sid], opts]}, rpcCB(sid));
@@ -441,7 +441,7 @@ var sendMessageByGroup = function(channelService, route, msg, groups, opts, cb)
       sendMessage(sid);
     } else {
       // empty group
-      process.nextTick(rpcCB);
+      process.nextTick(rpcCB(sid));
     }
   }
 };
@@ -541,4 +541,4 @@ var genKey = function(self, name) {
 
 var genValue = function(sid, uid) {
   return sid + ':' + uid;
-};
+};
diff --git a/lib/common/service/handlerService.js b/lib/common/service/handlerService.js
@@ -1,18 +1,21 @@
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var forwardLogger = require('pomelo-logger').getLogger('forward-log', __filename);
+var fs = require('fs');
 var utils = require('../../util/utils');
 var Loader = require('pomelo-loader');
 var pathUtil = require('../../util/pathUtil');
-
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+var forwardLogger = require('pomelo-logger').getLogger('forward-log', __filename);
 /**
  * Handler service.
  * Dispatch request to the relactive handler.
  *
  * @param {Object} app      current application context
  */
-var Service = function(app) {
+var Service = function(app, opts) {
   this.app = app;
   this.handlerMap = {};
+  if(!!opts.reloadHandlers) {
+    watchHandlers(app, this.handlerMap);
+  }
 };
 
 module.exports = Service;
@@ -78,4 +81,13 @@ var loadHandlers = function(app, serverType, handlerMap) {
   if(p) {
     handlerMap[serverType] = Loader.load(p, app);
   }
+};
+
+var watchHandlers = function(app, handlerMap) {
+  var p = pathUtil.getHandlerPath(app.getBase(), app.serverType);
+  fs.watch(p, function(event, name) {
+    if(event === 'change') {
+      handlerMap[app.serverType] = Loader.load(p, app);
+    }
+  });
 };
diff --git a/lib/components/server.js b/lib/components/server.js
@@ -9,17 +9,17 @@ var Server = require('../server/server');
  * @param {Object} app  current application context
  * @return {Object}     component instance
  */
-module.exports = function(app) {
-	return new Component(app);
+module.exports = function(app, opts) {
+	return new Component(app, opts);
 };
 
 /**
  * Server component class
  *
  * @param {Object} app  current application context
  */
-var Component = function(app) {
-	this.server = Server.create(app);
+var Component = function(app, opts) {
+	this.server = Server.create(app, opts);
 };
 
 var pro = Component.prototype;

diff --git a/lib/connectors/hybridsocket.js b/lib/connectors/hybridsocket.js
@@ -64,7 +64,7 @@ Socket.prototype.sendRaw = function(msg) {
 
   this.socket.send(msg, {binary: true}, function(err) {
     if(!!err) {
-      logger.error('websocket([%s]:[%s]) send binary data failed: %j', self.socket._socket.remoteAddress, self.socket._socket.remotePort, err);
+      logger.error('websocket send binary data failed: %j', err.stack);
       return;
     }
   });

diff --git a/lib/pomelo.js b/lib/pomelo.js
@@ -24,7 +24,7 @@ var Pomelo = module.exports = {};
  * Framework version.
  */
 
-Pomelo.version = '1.0.0-pre';
+Pomelo.version = '1.0.0';
 
 /**
  * Event definitions that would be emitted by app.event

diff --git a/lib/server/server.js b/lib/server/server.js
@@ -24,11 +24,12 @@ var ST_STOPED = 2;    // server stoped
  * @param {Object} app  current application context
  * @return {Object} erver instance
  */
-module.exports.create = function(app) {
-  return new Server(app);
+module.exports.create = function(app, opts) {
+  return new Server(app, opts);
 };
 
-var Server = function (app) {
+var Server = function (app, opts) {
+  this.opts = opts || {};
   this.app = app;
   this.globalFilterService = null;
   this.filterService = null;
@@ -53,7 +54,7 @@ pro.start = function() {
 
   this.globalFilterService = initFilter(true, this.app);
   this.filterService = initFilter(false, this.app);
-  this.handlerService = initHandler(this.app);
+  this.handlerService = initHandler(this.app, this.opts);
   this.cronHandlers = loadCronHandlers(this.app);
   loadCrons(this, this.app);
   this.state = ST_STARTED;
@@ -183,8 +184,8 @@ var initFilter = function(isGlobal, app) {
   return service;
 };
 
-var initHandler = function(app) {
-  return new HandlerService(app);
+var initHandler = function(app, opts) {
+  return new HandlerService(app, opts);
 };
 
 /**

diff --git a/lib/util/utils.js b/lib/util/utils.js
@@ -1,7 +1,9 @@
 var os = require('os');
 var util = require('util');
 var exec = require('child_process').exec;
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 var Constants = require('./constants');
+var pomelo = require('../pomelo');
 
 var utils = module.exports;
 
@@ -189,8 +191,15 @@ utils.checkPort = function(server, cb) {
   var host = server.host;
   var generateCommand = function(self, host, port) {
     var cmd;
+    var ssh_params = pomelo.app.get(Constants.RESERVED.SSH_CONFIG_PARAMS);
+    if(!!ssh_params && Array.isArray(ssh_params)) {
+      ssh_params = ssh_params.join(' ');
+    }
+    else{
+	    ssh_params = "";
+    }
     if (!self.isLocal(host)) {
-      cmd = util.format('ssh %s "netstat -an|awk \'{print $4}\'|grep %s|wc -l"', host, port);
+      cmd = util.format('ssh %s %s "netstat -an|awk \'{print $4}\'|grep %s|wc -l"', host, ssh_params, port);
     } else {
       cmd = util.format('netstat -an|awk \'{print $4}\'|grep %s|wc -l', port);
     }
@@ -222,7 +231,11 @@ utils.checkPort = function(server, cb) {
 
 utils.isLocal = function(host) {
   var app = require('../pomelo').app;
-  return host === '127.0.0.1' || host === 'localhost' || inLocal(host) || host === app.master.host;
+  if(!app) {
+    return host === '127.0.0.1' || host === 'localhost' || inLocal(host);
+  } else {
+    return host === '127.0.0.1' || host === 'localhost' || inLocal(host) || host === app.master.host;
+  }
 };
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "1.0.0-pre",
+  "version": "1.0.0",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {
@@ -35,10 +35,10 @@
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
     "pomelo-loader": "0.0.6",
-    "pomelo-rpc": "0.4.0",
+    "pomelo-rpc": "0.4.1",
     "pomelo-protocol": "0.1.3",
-    "pomelo-admin": "0.4.0",
-    "pomelo-logger": "0.1.2",
+    "pomelo-admin": "0.4.1",
+    "pomelo-logger": "0.1.5",
     "pomelo-scheduler": "0.3.8",
     "ws": "0.4.25",
     "pomelo-protobuf": "0.4.0",

diff --git a/test/application.js b/test/application.js
@@ -1,5 +1,4 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
-var app = require('../' + lib + '/application');
+var app = require('../lib/application');
 var pomelo = require('../');
 var should = require('should');
 

diff --git a/test/filters/handler/serial.js b/test/filters/handler/serial.js
@@ -1,7 +1,6 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var serialFilter = require('../../../' + lib + '/filters/handler/serial');
-var FilterService = require('../../../' + lib + '/common/service/filterService');
+var serialFilter = require('../../../lib/filters/handler/serial');
+var FilterService = require('../../../lib/common/service/filterService');
 var util = require('util');
 
 var mockSession = {

diff --git a/test/filters/handler/time.js b/test/filters/handler/time.js
@@ -1,7 +1,6 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var serialFilter = require('../../../' + lib + '/filters/handler/time');
-var FilterService = require('../../../' + lib + '/common/service/filterService');
+var serialFilter = require('../../../lib/filters/handler/time');
+var FilterService = require('../../../lib/common/service/filterService');
 var util = require('util');
 var mockSession = {
   key : "123"

diff --git a/test/filters/handler/timeout.js b/test/filters/handler/timeout.js
@@ -1,7 +1,6 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var timeoutFilter = require('../../../' + lib + '/filters/handler/timeout');
-var FilterService = require('../../../' + lib + '/common/service/filterService');
+var timeoutFilter = require('../../../lib/filters/handler/timeout');
+var FilterService = require('../../../lib/common/service/filterService');
 var util = require('util');
 var mockSession = {
   key : "123"

diff --git a/test/filters/handler/toobusy.js b/test/filters/handler/toobusy.js
@@ -1,7 +1,6 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var toobusyFilter = require('../../../' + lib + '/filters/handler/toobusy');
-var FilterService = require('../../../' + lib + '/common/service/filterService');
+var toobusyFilter = require('../../../lib/filters/handler/toobusy');
+var FilterService = require('../../../lib/common/service/filterService');
 var util = require('util');
 var mockSession = {
   key : "123"

diff --git a/test/filters/rpc/rpcLog.js b/test/filters/rpc/rpcLog.js
@@ -1,6 +1,5 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var rpcLogFilter = require('../../../' + lib + '/filters/rpc/rpcLog');
+var rpcLogFilter = require('../../../lib/filters/rpc/rpcLog');
 
 var mockData = {
   serverId : "connector-server-1",

diff --git a/test/filters/rpc/toobusy.js b/test/filters/rpc/toobusy.js
@@ -1,6 +1,5 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var toobusyFilter = require('../../../' + lib + '/filters/rpc/toobusy');
+var toobusyFilter = require('../../../lib/filters/rpc/toobusy');
 
 var mockData = {
   serverId : "connector-server-1",

diff --git a/test/manager/mockChannelManager.js b/test/manager/mockChannelManager.js
@@ -1,7 +1,5 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
-
 var DEFAULT_PREFIX = 'POMELO:CHANNEL';
-var utils = require('../../' + lib + '/util/utils');
+var utils = require('../../lib/util/utils');
 
 var MockManager = function(app, opts) {
   this.app = app;

diff --git a/test/manager/taskManager.js b/test/manager/taskManager.js
@@ -1,6 +1,5 @@
-var lib = process.env.POMELO_COV ? 'lib-cov' : 'lib';
 var should = require('should');
-var taskManager = require('../../' + lib + '/common/manager/taskManager');
+var taskManager = require('../../lib/common/manager/taskManager');
 
 // set timeout for test
 taskManager.timeout = 100;