utility process - treat exit code 15 as expected when killed (microsoft#186540) (microsoft#210738)

Author: bpasero

src/vs/platform/utilityProcess/electron-main/utilityProcess.ts

@@ -168,6 +168,7 @@ export class UtilityProcess extends Disposable {
 	private process: ElectronUtilityProcess | undefined = undefined;
 	private processPid: number | undefined = undefined;
 	private configuration: IUtilityProcessConfiguration | undefined = undefined;
+	private killed = false;
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
@@ -314,18 +315,19 @@ export class UtilityProcess extends Disposable {
 
 		// Exit
 		this._register(Event.fromNodeEventEmitter<number>(process, 'exit')(code => {
-			this.log(`received exit event with code ${code}`, Severity.Info);
+			const normalizedCode = this.isNormalExit(code) ? 0 : code;
+			this.log(`received exit event with code ${normalizedCode}`, Severity.Info);
 
 			// Event
-			this._onExit.fire({ pid: this.processPid!, code, signal: 'unknown' });
+			this._onExit.fire({ pid: this.processPid!, code: normalizedCode, signal: 'unknown' });
 
 			// Cleanup
 			this.onDidExitOrCrashOrKill();
 		}));
 
 		// Child process gone
 		this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
-			if (details.type === 'Utility' && details.name === serviceName) {
+			if (details.type === 'Utility' && details.name === serviceName && !this.isNormalExit(details.exitCode)) {
 				this.log(`crashed with code ${details.exitCode} and reason '${details.reason}'`, Severity.Error);
 
 				// Telemetry
@@ -415,12 +417,24 @@ export class UtilityProcess extends Disposable {
 		const killed = this.process.kill();
 		if (killed) {
 			this.log('successfully killed the process', Severity.Info);
+			this.killed = true;
 			this.onDidExitOrCrashOrKill();
 		} else {
 			this.log('unable to kill the process', Severity.Warning);
 		}
 	}
 
+	private isNormalExit(exitCode: number): boolean {
+		if (exitCode === 0) {
+			return true;
+		}
+
+		// Treat an exit code of 15 (SIGTERM) as a normal exit
+		// if we triggered the termination from process.kill()
+
+		return this.killed && exitCode === 15 /* SIGTERM */;
+	}
+
 	private onDidExitOrCrashOrKill(): void {
 		if (typeof this.processPid === 'number') {
 			UtilityProcess.all.delete(this.processPid);