fix(servicemanager): cancel shutdown timeouts after services stop

This commit is contained in:
2026-03-23 14:40:17 +00:00
parent 99430fbde4
commit 709f9fa894
4 changed files with 17 additions and 8 deletions

View File

@@ -158,12 +158,15 @@ export class ServiceManager {
runningInLevel.map(async (name) => {
const service = this.services.get(name)!;
try {
await Promise.race([
service.stop(),
plugins.smartdelay.delayFor(this.options.shutdownTimeoutMs).then(() => {
throw new Error(`Timeout stopping service '${name}'`);
}),
]);
const timeout = new plugins.smartdelay.Timeout(this.options.shutdownTimeoutMs);
const timeoutPromise = timeout.promise.then(() => {
throw new Error(`Timeout stopping service '${name}'`);
});
try {
await Promise.race([service.stop(), timeoutPromise]);
} finally {
timeout.cancel();
}
} catch (err) {
logger.log('warn', `${this.name}: error stopping '${name}': ${err instanceof Error ? err.message : String(err)}`);
}