diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-19 23:33:46 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-20 15:24:26 +0800 |
| commit | 356a797b194488d158fe161167657ef27eae4dbf (patch) | |
| tree | 93a58d8dc82583f88db653728a497376e068865e | |
| parent | 1845f9e5aba5566d5e89c49bba009187f23089b9 (diff) | |
| download | gitlab-ce-356a797b194488d158fe161167657ef27eae4dbf.tar.gz | |
Merge branch 'hook_retries' into 'master'
Add retries to system hook worker
Closes #31109
See merge request !10801
| -rw-r--r-- | app/workers/system_hook_worker.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/hook_retries.yml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/workers/system_hook_worker.rb b/app/workers/system_hook_worker.rb index baf2f12eeac..55d4e7d6dab 100644 --- a/app/workers/system_hook_worker.rb +++ b/app/workers/system_hook_worker.rb @@ -2,6 +2,8 @@ class SystemHookWorker include Sidekiq::Worker include DedicatedSidekiqQueue + sidekiq_options retry: 4 + def perform(hook_id, data, hook_name) SystemHook.find(hook_id).execute(data, hook_name) end diff --git a/changelogs/unreleased/hook_retries.yml b/changelogs/unreleased/hook_retries.yml new file mode 100644 index 00000000000..ee30399edbb --- /dev/null +++ b/changelogs/unreleased/hook_retries.yml @@ -0,0 +1,4 @@ +--- +title: Add retry to system hook worker +merge_request: 10801 +author: |