diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/workers/service_desk_email_receiver_worker.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/workers/service_desk_email_receiver_worker.rb')
-rw-r--r-- | app/workers/service_desk_email_receiver_worker.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/workers/service_desk_email_receiver_worker.rb b/app/workers/service_desk_email_receiver_worker.rb index 8649034445c..cfe63e059bb 100644 --- a/app/workers/service_desk_email_receiver_worker.rb +++ b/app/workers/service_desk_email_receiver_worker.rb @@ -3,13 +3,14 @@ class ServiceDeskEmailReceiverWorker < EmailReceiverWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker - def perform(raw) - return unless ::Gitlab::ServiceDeskEmail.enabled? - - begin - Gitlab::Email::ServiceDeskReceiver.new(raw).execute - rescue => e - handle_failure(raw, e) - end + feature_category :service_desk + sidekiq_options retry: 3 + + def should_perform? + ::Gitlab::ServiceDeskEmail.enabled? + end + + def receiver + @receiver ||= Gitlab::Email::ServiceDeskReceiver.new(raw) end end |