mb/regar
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prevent crash when killing dead process

Browse source
This commit is contained in:
JOLIMAITRE Matthieu 2024-11-09 17:13:45 +01:00
parent a40d71d8d4
commit e1b0954eb7
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
regar.ts
View file

@ -2,7 +2,7 @@
import { exists } from "https://deno.land/std@0.224.0/fs/exists.ts"; import { exists } from "https://deno.land/std@0.224.0/fs/exists.ts";
import { Command } from "https://deno.land/x/cliffy@v1.0.0-rc.4/command/mod.ts"; import { Command } from "https://deno.land/x/cliffy@v1.0.0-rc.4/command/mod.ts";
import { Channel } from "https://git.barnulf.net/mb/barnulf_ts/raw/branch/master/mod.ts"; import { Channel, Constructible, InstanceOf } from "https://git.barnulf.net/mb/barnulf_ts/raw/branch/master/mod.ts";
async function main() { async function main() {
const { do_clear, command, extensions, files, strategy } = await parse_args(); const { do_clear, command, extensions, files, strategy } = await parse_args();
@ -121,7 +121,7 @@ class WaitStrategy implements ShutdownStrategy {
class SoftStrategy implements ShutdownStrategy { class SoftStrategy implements ShutdownStrategy {
async shutdown(process_: Deno.ChildProcess) { async shutdown(process_: Deno.ChildProcess) {
Deno.kill(process_.pid, "SIGINT"); try_signal(process_.pid, "SIGINT");
await process_.output(); await process_.output();
return true; return true;
} }
@ -129,7 +129,7 @@ class SoftStrategy implements ShutdownStrategy {
class HardStrategy implements ShutdownStrategy { class HardStrategy implements ShutdownStrategy {
async shutdown(process_: Deno.ChildProcess) { async shutdown(process_: Deno.ChildProcess) {
Deno.kill(process_.pid, "SIGKILL"); try_signal(process_.pid, "SIGKILL");
return await true; return await true;
} }
} }
@ -145,6 +145,32 @@ async function process_exists(pid: number) {
return await exists(`/proc/${pid}`); return await exists(`/proc/${pid}`);
} }
function try_signal(pid: number, sig: Deno.Signal) {
catch_(
() => Deno.kill(pid, sig),
[Deno.errors.NotFound, "ignore"],
);
}
// deno-lint-ignore no-explicit-any
type Catching<C extends Constructible<C, any>, R = void> = [
exception: C,
strategy: ((exc: InstanceOf<C>) => R) | "ignore",
];
// deno-lint-ignore no-explicit-any
function catch_<T, R, Cs extends Catching<any, R>[]>(op: () => T, ...catchings: Cs) {
try {
return op();
} catch (exception) {
for (const [kind, strategy] of catchings) {
if (!(exception instanceof kind)) continue;
if (strategy === "ignore") return;
return strategy(exception);
}
}
}
function log(verb: string, value: unknown) { function log(verb: string, value: unknown) {
const yellow = "\x1b[0;33m"; const yellow = "\x1b[0;33m";
const bold = "\x1b[1m"; const bold = "\x1b[1m";