From e59e1211798b609128ba55632368dc9c7a902a1d Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sat, 8 Jul 2023 13:33:16 -0400 Subject: [PATCH] fix: Do not log errors for failed webhooks in hosted environment --- .../webhooks/server/tasks/DeliverWebhookTask.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/webhooks/server/tasks/DeliverWebhookTask.ts b/plugins/webhooks/server/tasks/DeliverWebhookTask.ts index fc4027e86..6dfa66542 100644 --- a/plugins/webhooks/server/tasks/DeliverWebhookTask.ts +++ b/plugins/webhooks/server/tasks/DeliverWebhookTask.ts @@ -1,4 +1,5 @@ import fetch from "fetch-with-proxy"; +import { FetchError } from "node-fetch"; import { useAgent } from "request-filtering-agent"; import { Op } from "sequelize"; import WebhookDisabledEmail from "@server/emails/templates/WebhookDisabledEmail"; @@ -600,10 +601,17 @@ export default class DeliverWebhookTask extends BaseTask { }); status = response.ok ? "success" : "failed"; } catch (err) { - Logger.error("Failed to send webhook", err, { - event, - deliveryId: delivery.id, - }); + if (err instanceof FetchError && env.DEPLOYMENT === "hosted") { + Logger.warn(`Failed to send webhook: ${err.message}`, { + event, + deliveryId: delivery.id, + }); + } else { + Logger.error("Failed to send webhook", err, { + event, + deliveryId: delivery.id, + }); + } status = "failed"; }