summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-02-26 09:41:48 +0000
committerDouwe Maan <douwe@gitlab.com>2019-02-26 09:41:48 +0000
commitb0097199a329c4de4eacc99a7d46d62c4ec0a1e0 (patch)
treef5f334d113753e68e88da9af9eaf0de11027d9ec
parentdb45c93441758a8ad82757d2c5a8a2a7997afc96 (diff)
parentf09399fc52d649bc4e145fc37ae309586846cc25 (diff)
downloadgitlab-ce-b0097199a329c4de4eacc99a7d46d62c4ec0a1e0.tar.gz
Merge branch 'enable_trace_sidekiq_development' into 'master'
Turn on backtrace for sidekiq in development See merge request gitlab-org/gitlab-ce!25515
-rw-r--r--config/initializers/sidekiq.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index be4183f39be..69a60a65e77 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -11,6 +11,10 @@ queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE
# Default is to retry 25 times with exponential backoff. That's too much.
Sidekiq.default_worker_options = { retry: 3 }
+if Rails.env.development?
+ Sidekiq.default_worker_options[:backtrace] = true
+end
+
enable_json_logs = Gitlab.config.sidekiq.log_format == 'json'
Sidekiq.configure_server do |config|