diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-19 20:43:50 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-19 23:45:51 +0300 |
| commit | 74b3b54929ed1a6453c342e66da4b0f8db9f72eb (patch) | |
| tree | e26cb5aa28058d4b01ce3691ce99428ff6f9b4b3 /lib | |
| parent | 80b6a6e1f23674800c081f717186b5cb8e72c4cf (diff) | |
Merge branch 'reduce-sidekiq-wait-timings' into 'master'
Reduce wait timings for Sidekiq jobs
See merge request !12270
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/job_waiter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/job_waiter.rb b/lib/gitlab/job_waiter.rb index 8db91d25a4b..208f0e1bbea 100644 --- a/lib/gitlab/job_waiter.rb +++ b/lib/gitlab/job_waiter.rb @@ -14,7 +14,7 @@ module Gitlab # timeout - The maximum amount of seconds to block the caller for. This # ensures we don't indefinitely block a caller in case a job takes # long to process, or is never processed. - def wait(timeout = 60) + def wait(timeout = 10) start = Time.current while (Time.current - start) <= timeout |