mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 21:07:28 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Fix new graceful shutdown env being always overridden by deprecated env (#8503)

Browse source
This commit is contained in:
Iván Ovejero 2024-02-01 11:10:40 +01:00 committed by GitHub
parent 88cf1823d3
commit cc41fc7c80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/commands/BaseCommand.ts
View file

@ -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<void> {
await initErrorHandling();

7
packages/cli/src/commands/worker.ts
View file

@ -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.',
);