Have terminalProcesses kill themselves when their parent is killed

Fixes #7458
microsoft · Jun 9, 2016 · 009ee1a · 009ee1a
1 parent 2386b26
commit 009ee1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -125,6 +125,7 @@ export class TerminalInstance {
 
 	private createTerminalProcess(): cp.ChildProcess {
 		let env = this.cloneEnv();
+		env['PTYPID'] = process.pid.toString();
 		env['PTYSHELL'] = this.shell.executable;
 		this.shell.args.forEach((arg, i) => {
 			env[`PTYSHELLARG${i}`] = arg;

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js b/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
@@ -30,6 +30,8 @@ process.on('message', function (message) {
 	}
 });
 
+setupPlanB(process.env.PTYPID);
+
 function getArgs() {
 	var args = [];
 	var i = 0;
@@ -38,4 +40,14 @@ function getArgs() {
 		i++;
 	}
 	return args;
+}
+
+function setupPlanB(parentPid) {
+	setInterval(function () {
+		try {
+			process.kill(parentPid, 0); // throws an exception if the main process doesn't exist anymore.
+		} catch (e) {
+			process.exit();
+		}
+	}, 5000);
 }