From cc41fc7c801ecb1b0de4b7c5af5a03b3f30fdce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 1 Feb 2024 11:10:40 +0100 Subject: [PATCH] fix(core): Fix new graceful shutdown env being always overridden by deprecated env (#8503) --- packages/cli/src/commands/BaseCommand.ts | 2 +- packages/cli/src/commands/worker.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts index a6a81805d4ebe..5cd5b0cbbfe02 100644 --- a/packages/cli/src/commands/BaseCommand.ts +++ b/packages/cli/src/commands/BaseCommand.ts @@ -44,7 +44,7 @@ export abstract class BaseCommand extends Command { /** * How long to wait for graceful shutdown before force killing the process. */ - protected gracefulShutdownTimeoutInS: number = config.getEnv('generic.gracefulShutdownTimeout'); + protected gracefulShutdownTimeoutInS = config.getEnv('generic.gracefulShutdownTimeout'); async init(): Promise { await initErrorHandling(); diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts index b8a47b86e5eef..07d8e9d899761 100644 --- a/packages/cli/src/commands/worker.ts +++ b/packages/cli/src/commands/worker.ts @@ -267,9 +267,10 @@ export class Worker extends BaseCommand { } async init() { - const configuredShutdownTimeout = config.getEnv('queue.bull.gracefulShutdownTimeout'); - if (configuredShutdownTimeout) { - this.gracefulShutdownTimeoutInS = configuredShutdownTimeout; + const { QUEUE_WORKER_TIMEOUT } = process.env; + if (QUEUE_WORKER_TIMEOUT) { + this.gracefulShutdownTimeoutInS = + parseInt(QUEUE_WORKER_TIMEOUT, 10) || config.default('queue.bull.gracefulShutdownTimeout'); this.logger.warn( 'QUEUE_WORKER_TIMEOUT has been deprecated. Rename it to N8N_GRACEFUL_SHUTDOWN_TIMEOUT.', );