sscoble/pi-mono
1
0
Fork 0
mirror of https://github.com/badlogic/pi-mono.git synced 2026-11-05 23:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(p2): exit through process.exit on a repeated signal, SIGHUP or a stalled close

Browse source 
A second Ctrl+C or SIGHUP killed the server without its exit hooks, leaving the macOS lock socket file behind; the next start then refused with a stale lock. A close that does not finish within 8 s now exits too.
This commit is contained in:
Armin Ronacher 2026-11-03 17:11:13 +01:00
parent 7dc38ff0e9
commit f0811457de
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/p2/src/hosts/server.ts
View file

@ -707,14 +707,28 @@ function isOwnerNotice(error: HostError): boolean {
return !isChordError(failure, "released") && !isChordError(failure, "forbidden");
}
/** How long a signalled server may take to close before it exits anyway (below `scripts/dev.mjs`'s 10 s SIGKILL). */
const CLOSE_DEADLINE_MS = 8000;
if (process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href) {
// Provider logins and server plugins (e.g. the Radius gateway) fetch in this process too.
configureFetch();
const server = await startServer();
console.log(`p2: http://127.0.0.1:${server.port} (data ${server.dataDir})`);
for (const signal of ["SIGINT", "SIGTERM"] as const) {
process.once(signal, () => {
void server.close().finally(() => process.exit(0));
});
}
// Every way out goes through `process.exit`: a signal's default action skips the exit hooks, which remove the
// macOS lock socket file (else the next start refuses) and kill the MCP servers' process groups.
let stopping = false;
const stop = (signal: NodeJS.Signals): void => {
if (stopping) {
console.error(`p2: ${signal} again, exiting without finishing the close`);
process.exit(1);
}
stopping = true;
setTimeout(() => {
console.error(`p2: the close did not finish within ${CLOSE_DEADLINE_MS / 1000} s, exiting`);
process.exit(1);
}, CLOSE_DEADLINE_MS).unref();
void server.close().finally(() => process.exit(0));
};
for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"] as const) process.on(signal, () => stop(signal));
}