diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-25 06:08:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-25 06:08:11 +0300 |
commit | 6c577c9ada5398fc44bc7a040a655b7a788eb0c9 (patch) | |
tree | b4a76d02f78dd1c42783b4aa782b20603f15861a /app | |
parent | fe96527139189c1f96d8677d16a98c3a9b18f8d6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/workers/concerns/gitlab/github_import/queue.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/workers/concerns/gitlab/github_import/queue.rb b/app/workers/concerns/gitlab/github_import/queue.rb index 7cc23dd7c0b..05eb7fbc2cb 100644 --- a/app/workers/concerns/gitlab/github_import/queue.rb +++ b/app/workers/concerns/gitlab/github_import/queue.rb @@ -15,6 +15,17 @@ module Gitlab # this is better than a project being stuck in the "import" state # forever. sidekiq_options dead: false, retry: 5 + + sidekiq_retries_exhausted do |msg, e| + Gitlab::Import::Logger.error( + event: :github_importer_exhausted, + message: msg['error_message'], + class: msg['class'], + args: msg['args'], + exception_message: e.message, + exception_backtrace: e.backtrace + ) + end end end end |