github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-25 17:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gateway): harden service-mode stale process cleanup (#38463, thanks @spirittechie)

Browse Source 
Co-authored-by: Jesse Paul <drzin69@gmail.com>
This commit is contained in:
Peter Steinberger
2026-03-07 21:36:00 +00:00
parent 1835d5808f
commit cc7e61612a
5 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/infra/restart-stale-pids.ts
View File

@@ -253,9 +253,12 @@ function waitForPortFreeSync(port: number): void {
*
* Called before service restart commands to prevent port conflicts.
*/
export function cleanStaleGatewayProcessesSync(): number[] {
export function cleanStaleGatewayProcessesSync(portOverride?: number): number[] {
try {
const port = resolveGatewayPort(undefined, process.env);
const port =
typeof portOverride === "number" && Number.isFinite(portOverride) && portOverride > 0
? Math.floor(portOverride)
: resolveGatewayPort(undefined, process.env);
const stalePids = findGatewayPidsOnPortSync(port);
if (stalePids.length === 0) {
return [];

21
src/infra/restart.test.ts
View File

@@ -95,6 +95,27 @@ describe.runIf(process.platform !== "win32")("cleanStaleGatewayProcessesSync", (
expect(killSpy).toHaveBeenCalledWith(6002, "SIGKILL");
});
it("uses explicit port override when provided", () => {
spawnSyncMock.mockReturnValue({
error: undefined,
status: 0,
stdout: ["p7001", "copenclaw"].join("\n"),
});
const killSpy = vi.spyOn(process, "kill").mockImplementation(() => true);
const killed = cleanStaleGatewayProcessesSync(19999);
expect(killed).toEqual([7001]);
expect(resolveGatewayPortMock).not.toHaveBeenCalled();
expect(spawnSyncMock).toHaveBeenCalledWith(
"/usr/sbin/lsof",
["-nP", "-iTCP:19999", "-sTCP:LISTEN", "-Fpc"],
expect.objectContaining({ encoding: "utf8", timeout: 2000 }),
);
expect(killSpy).toHaveBeenCalledWith(7001, "SIGTERM");
expect(killSpy).toHaveBeenCalledWith(7001, "SIGKILL");
});
it("returns empty when no stale listeners are found", () => {
spawnSyncMock.mockReturnValue({
error: undefined,