diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 18:08:10 +0000 |
| commit | 175b4fa261259ab0d033482d10bb4159fee8e538 (patch) | |
| tree | e1f1dba5e41177f11ffded5a505e0e7f692b8df5 /config/application.rb | |
| parent | 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (diff) | |
| download | gitlab-ce-175b4fa261259ab0d033482d10bb4159fee8e538.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index cad5c8bbe76..28c1eba920b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,6 +22,7 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/current_settings') require_dependency Rails.root.join('lib/gitlab/middleware/read_only') require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') + require_dependency Rails.root.join('lib/gitlab/runtime') # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -255,7 +256,7 @@ module Gitlab caching_config_hash[:compress] = false caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever - if Sidekiq.server? || defined?(::Puma) # threaded context + if Gitlab::Runtime.multi_threaded? caching_config_hash[:pool_size] = Gitlab::Redis::Cache.pool_size caching_config_hash[:pool_timeout] = 1 end |