Merge pull request #4744 from spalger/fix/restartCleanly

Immediately kill workers to prevent straglers
elastic · Aug 25, 2015 · f71275c · f71275c
2 parents 2d58242 + 3e88539
commit f71275c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/cli/cluster/ClusterManager.js b/src/cli/cluster/ClusterManager.js
@@ -92,7 +92,8 @@ module.exports = class ClusterManager {
     rl.prompt();
 
     rl.on('line', line => {
-      nls = line.trim() ? 0 : nls + 1;
+      nls = nls + 1;
+
       if (nls >= 2) {
         clearSoon.cancel();
         clear();

diff --git a/src/cli/cluster/Worker.js b/src/cli/cluster/Worker.js
@@ -19,7 +19,9 @@ let dead = fork => {
 };
 
 let kill = fork => {
-  fork.kill('SIGINT'); // make it snappy
+  // fork.kill() waits for process to disconnect, but causes occasional
+  // "ipc disconnected" errors and is too slow for the proc's "exit" event
+  fork.process.kill();
   fork.killed = true;
 };