admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gateway restart (#593)

Browse Source
This commit is contained in:
paisley
2026-03-19 18:22:24 +08:00
committed by GitHub
Unverified
parent 8029b507ba
commit 2471228cc2
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electron/api/routes/channels.ts
View File

@@ -41,9 +41,10 @@ function scheduleGatewayChannelRestart(ctx: HostApiContext, reason: string): voi
void reason; void reason;
} }
// Keep reload-first for feishu to avoid restart storms when channel auth/network is flaky. // Plugin-based channels require a full Gateway process restart to properly
// GatewayManager.reload() already falls back to restart when reload is unhealthy. // initialize / tear-down plugin connections. SIGUSR1 in-process reload is
const FORCE_RESTART_CHANNELS = new Set(['dingtalk', 'wecom', 'whatsapp']); // not sufficient for channel plugins (see restartGatewayForAgentDeletion).
const FORCE_RESTART_CHANNELS = new Set(['dingtalk', 'wecom', 'whatsapp', 'feishu', 'qqbot']);
function scheduleGatewayChannelSaveRefresh( function scheduleGatewayChannelSaveRefresh(
ctx: HostApiContext, ctx: HostApiContext,

6
electron/gateway/manager.ts
View File

@@ -242,8 +242,14 @@ export class GatewayManager extends EventEmitter {
await this.connect(port, externalToken); await this.connect(port, externalToken);
}, },
onConnectedToExistingGateway: () => { onConnectedToExistingGateway: () => {
// If the existing gateway is actually our own spawned UtilityProcess
// (e.g. after a self-restart code=1012), keep ownership so that
// stop() can still terminate the process during a restart() cycle.
const isOwnProcess = this.process?.pid != null && this.ownsProcess;
if (!isOwnProcess) {
this.ownsProcess = false; this.ownsProcess = false;
this.setStatus({ pid: undefined }); this.setStatus({ pid: undefined });
}
this.startHealthCheck(); this.startHealthCheck();
}, },
waitForPortFree: async (port) => { waitForPortFree: async (port) => {

7
electron/main/ipc-handlers.ts
View File

@@ -1361,9 +1361,10 @@ function registerGatewayHandlers(
* For checking package status and channel configuration * For checking package status and channel configuration
*/ */
function registerOpenClawHandlers(gatewayManager: GatewayManager): void { function registerOpenClawHandlers(gatewayManager: GatewayManager): void {
// Keep reload-first for feishu to avoid restart storms when channel auth/network is flaky. // Plugin-based channels require a full Gateway process restart to properly
// GatewayManager.reload() already falls back to restart when reload is unhealthy. // initialize / tear-down plugin connections. SIGUSR1 in-process reload is
const forceRestartChannels = new Set(['dingtalk', 'wecom', 'whatsapp']); // not sufficient for channel plugins (see restartGatewayForAgentDeletion).
const forceRestartChannels = new Set(['dingtalk', 'wecom', 'whatsapp', 'feishu', 'qqbot']);
const scheduleGatewayChannelRestart = (reason: string): void => { const scheduleGatewayChannelRestart = (reason: string): void => {
if (gatewayManager.getStatus().state !== 'stopped') { if (gatewayManager.getStatus().state !== 'stopped') {