diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 18:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 18:06:24 +0000 |
| commit | eca3cd3a9e7d9ea680086cad8150050ec8cdef3f (patch) | |
| tree | c3d262e0d8e721fc138c2d617f501fb09876f1b6 /config/application.rb | |
| parent | 6e81d7f6283fae1b22f66b9d9b133243921cbd9e (diff) | |
| download | gitlab-ce-eca3cd3a9e7d9ea680086cad8150050ec8cdef3f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 1d32ebcaa54..cad5c8bbe76 100644 --- a/config/application.rb +++ b/config/application.rb @@ -255,8 +255,8 @@ 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? # threaded context - caching_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5 + if Sidekiq.server? || defined?(::Puma) # threaded context + caching_config_hash[:pool_size] = Gitlab::Redis::Cache.pool_size caching_config_hash[:pool_timeout] = 1 end |