Use taskkill to kill processes on Windows (microsoft#22286)

For microsoft#22285
karthiknadig · Oct 23, 2023 · 9e07503 · 9e07503
1 parent daab11d
commit 9e07503
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/client/common/process/rawProcessApis.ts b/src/client/common/process/rawProcessApis.ts
@@ -73,7 +73,11 @@ export function shellExec(
         const disposable: IDisposable = {
             dispose: () => {
                 if (!proc.killed) {
-                    proc.kill();
+                    if (proc.pid) {
+                        killPid(proc.pid);
+                    } else {
+                        proc.kill();
+                    }
                 }
             },
         };
@@ -101,7 +105,11 @@ export function plainExec(
     const disposable: IDisposable = {
         dispose: () => {
             if (!proc.killed) {
-                proc.kill();
+                if (proc.pid) {
+                    killPid(proc.pid);
+                } else {
+                    proc.kill();
+                }
             }
         },
     };
@@ -219,7 +227,11 @@ export function execObservable(
             internalDisposables.push(
                 options.token.onCancellationRequested(() => {
                     if (!procExited && !proc.killed) {
-                        proc.kill();
+                        if (proc.pid) {
+                            killPid(proc.pid);
+                        } else {
+                            proc.kill();
+                        }
                         procExited = true;
                     }
                 }),
@@ -279,6 +291,6 @@ export function killPid(pid: number): void {
             process.kill(pid);
         }
     } catch {
-        // Ignore.
+        traceVerbose('Unable to kill process with pid', pid);
     }
 }