fix bug in reload, only the first process in dielist will be kill

aleafs · aleafs · commit ef97f25d2fed · 2012-11-22T15:06:10.000+08:00
diff --git a/lib/child.js b/lib/child.js
@@ -72,6 +72,11 @@ exports.create = function (argv, options) {
      */
     this.pstatus = {};
 
+    /**
+     * @ 正常进程数
+     */
+    this.okcount = 0;
+
     /**
      * @ 即将消亡的进程列表
      */
@@ -122,6 +127,8 @@ exports.create = function (argv, options) {
       delete workers[pid];
       delete _self.pstatus[pid];
       delete _self.dielist[pid];
+
+      _self.okcount = Math.max(0, _self.okcount - 1);
       _self.emit('exit', pid, code, signal);
 
       if (!_self.running) {
@@ -163,10 +170,12 @@ exports.create = function (argv, options) {
           } catch (e) {
           }
         });
-        for (var i in _self.dielist) {
-          if (workers[i]) {
-            workers[i].kill('SIGTERM');
-            break;
+        _self.okcount++;
+        if (_self.okcount >= _options.children / 2) {
+          for (var i in _self.dielist) {
+            if (workers[i]) {
+              workers[i].kill('SIGTERM');
+            }
           }
         }
       } else if ('function' === (typeof MessageHandle[msg.type])) {
@@ -188,6 +197,7 @@ exports.create = function (argv, options) {
         n++;
       }
     });
+    _self.okcount = n;
 
     while (n < _options.children) {
       _self._fork();
@@ -200,6 +210,7 @@ exports.create = function (argv, options) {
   Child.prototype.stop  = function (signal) {
     var _self = this;
     _self.running = 0;
+    _self.okcount = 0;
 
     Object.keys(handles).forEach(function (i) {
       handles[i].close();
@@ -221,6 +232,7 @@ exports.create = function (argv, options) {
   /* {{{ public prototype reload() */
   Child.prototype.reload = function () {
     var _self = this;
+    _self.okcount = 0;
     Object.keys(workers).forEach(function (i) {
       _self.dielist[i] = true;
     });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pm",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Aleafs Zhang (zhangxc83@gmail.com)",
   "contributors": [
     {"name": "fengmk2", "email": "fengmk2@gmail.com", "web": "http://fengmk2.github.com"} 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pm",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.0.1",`
`4`	`4`	`"author": "Aleafs Zhang ([email protected])",`
`5`	`5`	`"contributors": [`
`6`	`6`	`{"name": "fengmk2", "email": "[email protected]", "web": "http://fengmk2.github.com"}`