summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-11-08 12:37:10 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-11-08 12:37:10 +0000
commitfa88474ab5bdd664bbc62b09ec3d049fb2af55bd (patch)
tree38a927d0cd44f5d306bb0bdfb9b51e2a57a325ae /config
parent0e1444f906f8977aee08b179ded0c88dbd5e5f95 (diff)
parentd498ec98e0286efecd70040180c69c2002f9ed78 (diff)
downloadgitlab-ce-fa88474ab5bdd664bbc62b09ec3d049fb2af55bd.tar.gz
Merge branch 'sidekiq_default_retries' into 'master'
Set default Sidekiq retries to 3 See merge request !7294
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 0455a98dbfe..023af2af23c 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -2,6 +2,9 @@
redis_config_hash = Gitlab::Redis.params
redis_config_hash[:namespace] = Gitlab::Redis::SIDEKIQ_NAMESPACE
+# Default is to retry 25 times with exponential backoff. That's too much.
+Sidekiq.default_worker_options = { retry: 3 }
+
Sidekiq.configure_server do |config|
config.redis = redis_config_hash