github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 19:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tighten gateway restart loop handling (#23416) (thanks @jeffwnli)

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-22 10:36:11 +01:00
parent 26acb77450
commit dd07c06d00
6 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/cli/gateway-cli/run-loop.ts
View File

@@ -23,7 +23,7 @@ export async function runGatewayLoop(params: {
start: () => Promise<Awaited<ReturnType<typeof startGatewayServer>>>;
runtime: typeof defaultRuntime;
}) {
const lock = await acquireGatewayLock();
let lock = await acquireGatewayLock();
let server: Awaited<ReturnType<typeof startGatewayServer>> | null = null;
let shuttingDown = false;
let restartResolver: (() => void) | null = null;
@@ -83,8 +83,12 @@ export async function runGatewayLoop(params: {
clearTimeout(forceExitTimer);
server = null;
if (isRestart) {
const hadLock = lock != null;
// Release the lock BEFORE spawning so the child can acquire it immediately.
await lock?.release();
if (lock) {
await lock.release();
lock = null;
}
const respawn = restartGatewayProcessWithFreshPid();
if (respawn.mode === "spawned" || respawn.mode === "supervised") {
const modeLabel =
@@ -102,11 +106,29 @@ export async function runGatewayLoop(params: {
} else {
gatewayLog.info("restart mode: in-process restart (OPENCLAW_NO_RESPAWN)");
}
shuttingDown = false;
restartResolver?.();
let canContinueInProcessRestart = true;
if (hadLock) {
try {
lock = await acquireGatewayLock();
} catch (err) {
gatewayLog.error(
`failed to reacquire gateway lock for in-process restart: ${String(err)}`,
);
cleanupSignals();
params.runtime.exit(1);
canContinueInProcessRestart = false;
}
}
if (canContinueInProcessRestart) {
shuttingDown = false;
restartResolver?.();
}
}
} else {
await lock?.release();
if (lock) {
await lock.release();
lock = null;
}
cleanupSignals();
params.runtime.exit(0);
}
@@ -161,7 +183,10 @@ export async function runGatewayLoop(params: {
});
}
} finally {
await lock?.release();
if (lock) {
await lock.release();
lock = null;
}
cleanupSignals();
}
}