mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 04:04:06 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(core): Separate error handlers for main and worker (#11091)

Browse source
This commit is contained in:
Iván Ovejero 2024-10-04 16:38:48 +02:00 committed by GitHub
parent 722f4a8b77
commit bb59cc71ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/cli/src/scaling/scaling.service.ts
View file

@ -203,14 +203,6 @@ export class ScalingService {
// #region Listeners // #region Listeners
private registerListeners() { private registerListeners() {
this.queue.on('error', (error: Error) => {
if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
this.logger.error('[ScalingService] Queue errored', { error });
throw error;
});
const { instanceType } = this.instanceSettings; const { instanceType } = this.instanceSettings;
if (instanceType === 'main' || instanceType === 'webhook') { if (instanceType === 'main' || instanceType === 'webhook') {
this.registerMainOrWebhookListeners(); this.registerMainOrWebhookListeners();
@ -230,6 +222,8 @@ export class ScalingService {
}); });
this.queue.on('error', (error: Error) => { this.queue.on('error', (error: Error) => {
if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
if (error.message.includes('job stalled more than maxStalledCount')) { if (error.message.includes('job stalled more than maxStalledCount')) {
throw new MaxStalledCountError(error); throw new MaxStalledCountError(error);
} }
@ -244,6 +238,8 @@ export class ScalingService {
process.exit(1); process.exit(1);
} }
this.logger.error('[ScalingService] Queue errored', { error });
throw error; throw error;
}); });
} }
@ -252,6 +248,14 @@ export class ScalingService {
* Register listeners on a `main` or `webhook` process for Bull queue events. * Register listeners on a `main` or `webhook` process for Bull queue events.
*/ */
private registerMainOrWebhookListeners() { private registerMainOrWebhookListeners() {
this.queue.on('error', (error: Error) => {
if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
this.logger.error('[ScalingService] Queue errored', { error });
throw error;
});
this.queue.on('global:progress', (_jobId: JobId, msg: unknown) => { this.queue.on('global:progress', (_jobId: JobId, msg: unknown) => {
if (!this.isPubSubMessage(msg)) return; if (!this.isPubSubMessage(msg)) return;