Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move config pre-flight before onNotLoaded in runServiceRestart (Codex P2)

Browse Source 
The config check was positioned after onNotLoaded, which could send
SIGUSR1 to an unmanaged process before config was validated.
This commit is contained in:
merlin 2026-03-09 08:25:31 +08:00 committed by Peter Steinberger
parent 954928a90d
commit 5f85b654f0
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cli/daemon-cli/lifecycle-core.ts
View File

@ -333,6 +333,19 @@ export async function runServiceRestart(params: {
if (loaded === null) {
return false;
}
// Pre-flight config validation: check before any restart action (including
// onNotLoaded which may send SIGUSR1 to an unmanaged process). (#35862)
{
const configError = await getConfigValidationError();
if (configError) {
fail(
`${params.serviceNoun} aborted: config is invalid.\n${configError}\nFix the config and retry, or run "openclaw doctor" to repair.`,
);
return false;
}
}
if (!loaded) {
try {
handledNotLoaded = (await params.onNotLoaded?.({ json, stdout, fail })) ?? null;
@ -388,17 +401,6 @@ export async function runServiceRestart(params: {
}
}
// Pre-flight config validation (#35862)
{
const configError = await getConfigValidationError();
if (configError) {
fail(
`${params.serviceNoun} aborted: config is invalid.\n${configError}\nFix the config and retry, or run "openclaw doctor" to repair.`,
);
return false;
}
}
try {
if (loaded) {
await params.service.restart({ env: process.env, stdout });