Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: change kill to signal the whole process group to terminate #6859

Merged
merged 2 commits into from Feb 17, 2022
Merged

fix: change kill to signal the whole process group to terminate #6859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b08a9b
fix: change kill to signal the whole process group to terminate immed…
petuomin Feb 24, 2021
7b5cccc
chore: ignore taskkill errors
jschfflr Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/node/BrowserRunner.ts
View file
Open in desktop
Expand Up @@ -183,9 +183,16 @@ export class BrowserRunner {
// If the process failed to launch (for example if the browser executable path
// is invalid), then the process does not get a pid assigned. A call to
// `proc.kill` would error, as the `pid` to-be-killed can not be found.
if (this.proc && this.proc.pid && !this.proc.killed) {
if (this.proc && this.proc.pid && pidExists(this.proc.pid)) {
try {
this.proc.kill('SIGKILL');
if (process.platform === 'win32') {
childProcess.exec(`taskkill /pid ${this.proc.pid} /T /F`, () => {});
} else {
// on linux the process group can be killed with the group id prefixed with
// a minus sign. The process group id is the group leader's pid.
const processGroupId = -this.proc.pid;
process.kill(processGroupId, 'SIGKILL');
}
} catch (error) {
throw new Error(
`${PROCESS_ERROR_EXPLANATION}\nError cause: ${error.stack}`
Expand Down Expand Up @@ -294,3 +301,15 @@ function waitForWSEndpoint(
}
});
}

function pidExists(pid: number): boolean {
try {
return process.kill(pid, 0);
} catch (error) {
if (error && error.code && error.code === 'ESRCH') {
return false;
} else {
throw error;
}
}
}