From 1b00d51c74d654bfc2ff3f4e226349c34a661b7a Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 8 Aug 2022 11:10:10 +0200
Subject: [PATCH] fix: Check WebhookSubscription is not disabled before
 delivery attempt

---
 server/queues/tasks/DeliverWebhookTask.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/queues/tasks/DeliverWebhookTask.ts b/server/queues/tasks/DeliverWebhookTask.ts
index 43daf8786..b9bd85113 100644
--- a/server/queues/tasks/DeliverWebhookTask.ts
+++ b/server/queues/tasks/DeliverWebhookTask.ts
@@ -79,10 +79,18 @@ export default class DeliverWebhookTask extends BaseTask<Props> {
       rejectOnEmpty: true,
     });
 
-    Logger.info(
-      "task",
-      `DeliverWebhookTask: ${event.name} for ${subscription.name}`
-    );
+    if (!subscription.enabled) {
+      Logger.info("task", `WebhookSubscription was disabled before delivery`, {
+        event: event.name,
+        subscriptionId: subscription.id,
+      });
+      return;
+    }
+
+    Logger.info("task", `DeliverWebhookTask: ${event.name}`, {
+      event: event.name,
+      subscriptionId: subscription.id,
+    });
 
     switch (event.name) {
       case "api_keys.create":