github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 11:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI: fix gateway restart health ownership for child listener pids (#24696)

Browse Source 
Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: d6d4b43f7e
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
Gustavo Madeira Santana
2026-02-23 13:53:10 -05:00
committed by GitHub
parent 78e7f41d28
commit 5de1f540e7
5 changed files with 104 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cli/daemon-cli/restart-health.ts
View File

@@ -21,6 +21,13 @@ export type GatewayRestartSnapshot = {
staleGatewayPids: number[];
};
function listenerOwnedByRuntimePid(params: {
listener: PortUsage["listeners"][number];
runtimePid: number;
}): boolean {
return params.listener.pid === params.runtimePid || params.listener.ppid === params.runtimePid;
}
export async function inspectGatewayRestart(params: {
service: GatewayService;
port: number;
@@ -54,18 +61,27 @@ export async function inspectGatewayRestart(params: {
)
: [];
const running = runtime.status === "running";
const runtimePid = runtime.pid;
const ownsPort =
runtime.pid != null
? portUsage.listeners.some((listener) => listener.pid === runtime.pid)
runtimePid != null
? portUsage.listeners.some((listener) => listenerOwnedByRuntimePid({ listener, runtimePid }))
: gatewayListeners.length > 0 ||
(portUsage.status === "busy" && portUsage.listeners.length === 0);
const healthy = running && ownsPort;
const staleGatewayPids = Array.from(
new Set(
gatewayListeners
.map((listener) => listener.pid)
.filter((pid): pid is number => Number.isFinite(pid))
.filter((pid) => runtime.pid == null || pid !== runtime.pid || !running),
.filter((listener) => Number.isFinite(listener.pid))
.filter((listener) => {
if (!running) {
return true;
}
if (runtimePid == null) {
return true;
}
return !listenerOwnedByRuntimePid({ listener, runtimePid });
})
.map((listener) => listener.pid as number),
),
);