Handle exit code of 1 when terminating Kibana process on windows (ela…

…stic#24151) * Handle exit code of 1 on windows * Remove space to fix intake failure * Update using solution from Spencer * Update debug log message Co-Authored-By: liza-mae <[email protected]>
liza-mae · Oct 22, 2018 · 432ad3f · 432ad3f
1 parent cf0dda0
commit 432ad3f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.js b/packages/kbn-dev-utils/src/proc_runner/proc.js
@@ -94,6 +94,9 @@ export function createProc(name, { cmd, args, cwd, env, stdin, log }) {
       const exit$ = Rx.fromEvent(childProcess, 'exit').pipe(
         take(1),
         map(([code]) => {
+          if (this._stopCalled) {
+            return null;
+          }
           // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat then as errors
           if (code > 0 && !(code === 143 || code === 130)) {
             throw createCliError(`[${name}] exited with code ${code}`);
@@ -118,9 +121,16 @@ export function createProc(name, { cmd, args, cwd, env, stdin, log }) {
       return this._outcomePromise;
     }
 
+    _stopCalled = false;
+
     async stop(signal) {
+      if (this._stopCalled) {
+        return;
+      }
+      this._stopCalled = true;
       await withTimeout(
         async () => {
+          log.debug(`Sending "${signal}" to proc "${name}"`);
           await treeKillAsync(childProcess.pid, signal);
           await this.getOutcomePromise();
         },