From 45ec1b35d24c9b35aec7237919a0039d6a6d7479 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Mon, 10 Feb 2025 18:06:06 +0100 Subject: [PATCH 1/2] zinnia: fix reporting AbortErrors to Sentry --- lib/zinnia.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/zinnia.js b/lib/zinnia.js index 4b15cec1..23847f12 100644 --- a/lib/zinnia.js +++ b/lib/zinnia.js @@ -319,8 +319,12 @@ export async function run ({ ]) console.error('Zinnia main loop ended') } catch (err) { - console.error('Zinnia main loop errored', err) - maybeReportErrorToSentry(err) + if (err.name === 'AbortError') { + console.error('Zinnia main loop aborted') + } else { + console.error('Zinnia main loop errored', err) + maybeReportErrorToSentry(err) + } } finally { controller.abort() } From d7943664fb34b168e25da48807754d27dcd70c26 Mon Sep 17 00:00:00 2001 From: Julian Gruber Date: Mon, 10 Feb 2025 18:11:29 +0100 Subject: [PATCH 2/2] add report inactive module to Sentry --- lib/zinnia.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/zinnia.js b/lib/zinnia.js index 23847f12..a6db14f4 100644 --- a/lib/zinnia.js +++ b/lib/zinnia.js @@ -280,6 +280,11 @@ export async function run ({ type: 'error', message: `${capitalize(module)} has been inactive for 5 minutes, restarting...` }) + + const err = new Error('Module inactive for 5 minutes') + Object.assign(err, { module }) + maybeReportErrorToSentry(err) + controller.abort() }, 5 * 60 * 1000) }