Merge pull request #193 from NativeScript/iiivanov/proc-kill-2

Fix process kill

Author: ivanovit

package.json

@@ -37,6 +37,7 @@
     "@types/mocha": "^5.2.1",
     "@types/node": "6.0.46",
     "@types/universal-analytics": "0.4.1",
+    "cpx": "^1.5.0",
     "mocha": "^5.2.0",
     "sinon": "^5.0.10",
     "tslint": "5.10.0",
@@ -49,7 +50,7 @@
   "scripts": {
     "clean": "git clean -fdx",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "build": "tsc -p ./src",
+    "build": "tsc -p ./src && cpx src/common/*.sh out/common",
     "package": "vsce package",
     "full-build": "npm run clean && npm install && npm run build && npm run package",
     "launch-as-server": "node --nolazy ./out/debug-adapter/nativeScriptDebug.js --server=4712",

src/common/terminateProcess.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+terminateTree() {
+	for cpid in $(/usr/bin/pgrep -P $1); do
+		terminateTree $cpid
+	done
+	kill -9 $1 > /dev/null 2>&1
+}
+
+for pid in $*; do
+	terminateTree $pid
+done

src/common/utilities.ts

@@ -1,15 +1,25 @@
-import { ChildProcess, exec } from 'child_process';
+import { ChildProcess, execSync } from 'child_process';
 import * as os from 'os';
+import * as path from 'path';
+import { ILogger, LogLevel } from '../common/logger';
 
-export function killProcess(childProcess: ChildProcess): void {
-    switch (process.platform) {
-        case 'win32':
-            exec(`taskkill /pid ${childProcess.pid} /T /F`);
-            break;
+export function killProcess(childProcess: ChildProcess, logger?: ILogger): void {
+    logger && logger.log(`Stopping process: ${childProcess.pid}`);
 
-        default:
-            childProcess.kill('SIGINT');
-            break;
+    try {
+        switch (process.platform) {
+            case 'win32':
+                execSync(`taskkill /pid ${childProcess.pid} /T /F`);
+                break;
+
+            default:
+                const cmd = path.join(__dirname, 'terminateProcess.sh');
+
+                execSync(`${cmd} ${childProcess.pid.toString()}`);
+                break;
+        }
+    } catch (error) {
+        logger && logger.log(error, LogLevel.Error);
     }
 }