From b6c19cba20bffe18eea7bbd4b31fa640b04ac00b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Apr 2020 21:24:09 +0100
Subject: [PATCH] FIX: Abort emit_web_hook_event job cleanly if web hook was
 deleted (#9445)

Raising an error causes the job to be retried, and causes a lot of noise in the logs
---
 app/jobs/regular/emit_web_hook_event.rb | 3 ++-
 spec/jobs/emit_web_hook_event_spec.rb   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index ffd8e410ec..57ee27f2ce 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -14,6 +14,8 @@ module Jobs
       @web_hook = WebHook.find_by(id: @arguments[:web_hook_id])
       validate_arguments!
 
+      return if @web_hook.blank? # Web Hook was deleted
+
       unless ping_event?(@arguments[:event_type])
         validate_argument!(:payload)
 
@@ -31,7 +33,6 @@ module Jobs
     def validate_arguments!
       validate_argument!(:web_hook_id)
       validate_argument!(:event_type)
-      raise Discourse::InvalidParameters.new(:web_hook_id) if @web_hook.blank?
     end
 
     def validate_argument!(key)
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 453db11abb..0e649c882e 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -17,13 +17,13 @@ describe Jobs::EmitWebHookEvent do
 
   it 'raises an error when there is no event type' do
     expect do
-      subject.execute(web_hook_id: 1, payload: {})
+      subject.execute(web_hook_id: post_hook.id, payload: {})
     end.to raise_error(Discourse::InvalidParameters)
   end
 
   it 'raises an error when there is no payload' do
     expect do
-      subject.execute(web_hook_id: 1, event_type: 'post')
+      subject.execute(web_hook_id: post_hook.id, event_type: 'post')
     end.to raise_error(Discourse::InvalidParameters)
   end