update to 0.8.7, add command line kill remain server log

Change-Id: I1147b0964e4d71533480bbbbc9ffa0af32ea5883
fubuki · Jan 28, 2014 · 1e0af82 · 1e0af82
1 parent d21d044
commit 1e0af82
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,7 @@
+0.8.7 / 2013-01-28
+=================
+* refactor pomelo command, report remained servers if kill failed 
+
 0.8.6 / 2013-01-22
 =================
 * upgrade pomelo-rpc 0.2.9

diff --git a/lib/modules/console.js b/lib/modules/console.js
@@ -31,6 +31,7 @@ var Module = function(opts) {
 };
 
 Module.prototype.monitorHandler = function(agent, msg, cb) {
+  var serverId = agent.id;
   switch(msg.signal) {
     case 'stop':
       if(agent.type === 'master') {
@@ -39,7 +40,6 @@ Module.prototype.monitorHandler = function(agent, msg, cb) {
       this.app.stop(true);
       break;
     case 'list':
-      var serverId = agent.id;
       var serverType = agent.type;
       var pid = process.pid;
       var heapUsed = (process.memoryUsage().heapUsed/(1024 * 1024)).toFixed(2);
@@ -52,7 +52,6 @@ Module.prototype.monitorHandler = function(agent, msg, cb) {
       });
       break;
     case 'kill':
-      var serverId = agent.id;
       utils.invokeCallback(cb, serverId);
       if (agent.type !== 'master') {
         setTimeout(function() {
@@ -114,18 +113,21 @@ var kill = function(app, agent, msg, cb) {
     }, MONITOR_KILL_DELAY);
   });
 
-  for(sid in agent.idMap) {
-    record = agent.idMap[sid];
-    serverIds.push(record.id);
-    agent.request(record.id, module.exports.moduleId, { signal: msg.signal }, function(msg) {
+  var agentRequestCallback = function(msg) {
       for (var i = 0; i < serverIds.length; ++i) {
         if (serverIds[i] === msg) {
           serverIds.splice(i,1);
           latch.done();
           break;
         }
       }
-    });
+  };
+
+
+  for(sid in agent.idMap) {
+    record = agent.idMap[sid];
+    serverIds.push(record.id);
+    agent.request(record.id, module.exports.moduleId, { signal: msg.signal }, agentRequestCallback);
   }
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {
@@ -39,7 +39,7 @@
     "pomelo-logger": "0.1.2",
     "pomelo-scheduler": "0.3.8",
     "ws": "0.4.25",
-    "toobusy": "0.2.2",
+    "toobusy": "0.2.4",
     "pomelo-protobuf": "0.4.0",
     "node-bignumber": "1.2.1",
     "commander": "2.0.0"