diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 21:06:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 21:06:33 +0300 |
| commit | 581c10e344d85729e77fce78513819d159289dc5 (patch) | |
| tree | ea84e89fddcafe5a8abdc8a9a5f7f210b6644e77 /config/initializers | |
| parent | 68d3f33d5194c446812d09f079749ddf56f95378 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index c3ca9bf3e05..35e67e04bfb 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -31,7 +31,7 @@ enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? use_sidekiq_daemon_memory_killer = ENV["SIDEKIQ_DAEMON_MEMORY_KILLER"].to_i.nonzero? use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer -use_request_store = ENV['SIDEKIQ_REQUEST_STORE'].to_i.nonzero? +use_request_store = ENV.fetch('SIDEKIQ_REQUEST_STORE', 1).to_i.nonzero? Sidekiq.configure_server do |config| config.redis = queues_config_hash |