diff options
Diffstat (limited to 'app/workers/web_hooks')
-rw-r--r-- | app/workers/web_hooks/destroy_worker.rb | 9 | ||||
-rw-r--r-- | app/workers/web_hooks/log_destroy_worker.rb | 24 |
2 files changed, 27 insertions, 6 deletions
diff --git a/app/workers/web_hooks/destroy_worker.rb b/app/workers/web_hooks/destroy_worker.rb index 822a1e770d7..8f9b194f88a 100644 --- a/app/workers/web_hooks/destroy_worker.rb +++ b/app/workers/web_hooks/destroy_worker.rb @@ -4,6 +4,8 @@ module WebHooks class DestroyWorker include ApplicationWorker + DestroyError = Class.new(StandardError) + data_consistency :always sidekiq_options retry: 3 feature_category :integrations @@ -19,12 +21,7 @@ module WebHooks result = ::WebHooks::DestroyService.new(user).sync_destroy(hook) - return result if result[:status] == :success - - e = ::WebHooks::DestroyService::DestroyError.new(result[:message]) - Gitlab::ErrorTracking.track_exception(e, web_hook_id: hook.id) - - raise e + result.track_and_raise_exception(as: DestroyError, web_hook_id: hook.id) end end end diff --git a/app/workers/web_hooks/log_destroy_worker.rb b/app/workers/web_hooks/log_destroy_worker.rb new file mode 100644 index 00000000000..9ea5c70e416 --- /dev/null +++ b/app/workers/web_hooks/log_destroy_worker.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module WebHooks + class LogDestroyWorker + include ApplicationWorker + + DestroyError = Class.new(StandardError) + + data_consistency :always + feature_category :integrations + urgency :low + + idempotent! + + def perform(params = {}) + hook_id = params['hook_id'] + return unless hook_id + + result = ::WebHooks::LogDestroyService.new(hook_id).execute + + result.track_and_raise_exception(as: DestroyError, web_hook_id: hook_id) + end + end +end |