From 76ab411bc0a18756a52040129ff76187221a4c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 11 Dec 2023 09:45:08 +0100 Subject: [PATCH] refactor(core): Instrument multi-main to report failures to renew lease (#7970) ## Summary Instrument multi-main to report failures to renew the lease https://linear.app/n8n/issue/PAY-1105 ... #### How to test the change: 1. ... ## Issues fixed Include links to Github issue or Community forum post or **Linear ticket**: > Important in order to close automatically and provide context to reviewers ... ## Review / Merge checklist - [ ] PR title and summary are descriptive. **Remember, the title automatically goes into the changelog. Use `(no-changelog)` otherwise.** ([conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md)) - [ ] [Docs updated](https://github.com/n8n-io/n8n-docs) or follow-up ticket created. - [ ] Tests included. > A bug is not considered fixed, unless a test is added to prevent it from happening again. A feature is not complete without tests. > > *(internal)* You can use Slack commands to trigger [e2e tests](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#a39f9e5ba64a48b58a71d81c837e8227) or [deploy test instance](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#f6a177d32bde4b57ae2da0b8e454bfce) or [deploy early access version on Cloud](https://www.notion.so/n8n/Cloudbot-3dbe779836004972b7057bc989526998?pvs=4#fef2d36ab02247e1a0f65a74f6fb534e). --- .../cli/src/services/orchestration/main/MultiMainSetup.ee.ts | 5 +++++ packages/workflow/src/ErrorReporterProxy.ts | 2 ++ packages/workflow/src/errors/application.error.ts | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts index a731069c57..2a23690906 100644 --- a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts +++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts @@ -3,6 +3,7 @@ import { Service } from 'typedi'; import { TIME } from '@/constants'; import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup'; import { getRedisPrefix } from '@/services/redis/RedisServiceHelper'; +import { ErrorReporterProxy as EventReporter } from 'n8n-workflow'; @Service() export class MultiMainSetup extends SingleMainSetup { @@ -79,6 +80,10 @@ export class MultiMainSetup extends SingleMainSetup { if (config.getEnv('multiMainSetup.instanceType') === 'leader') { this.emit('leadershipChange', leaderId); // stop triggers, pruning, etc. + EventReporter.report('[Multi-main setup] Leader failed to renew leader key', { + level: 'info', + }); + config.set('multiMainSetup.instanceType', 'follower'); } diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts index 75c1b9fef3..fc5a08828d 100644 --- a/packages/workflow/src/ErrorReporterProxy.ts +++ b/packages/workflow/src/ErrorReporterProxy.ts @@ -33,5 +33,7 @@ export const error = (e: unknown, options?: ReportingOptions) => { if (toReport) instance.report(toReport, options); }; +export const report = error; + export const warn = (warning: Error | string, options?: ReportingOptions) => error(warning, { level: 'warning', ...options }); diff --git a/packages/workflow/src/errors/application.error.ts b/packages/workflow/src/errors/application.error.ts index 79002c074c..e48ae91bee 100644 --- a/packages/workflow/src/errors/application.error.ts +++ b/packages/workflow/src/errors/application.error.ts @@ -1,7 +1,7 @@ import callsites from 'callsites'; import type { Event } from '@sentry/node'; -type Level = 'warning' | 'error' | 'fatal'; +type Level = 'warning' | 'error' | 'fatal' | 'info'; export type ReportingOptions = { level?: Level;