From eca3cd3a9e7d9ea680086cad8150050ec8cdef3f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 Nov 2019 18:06:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/application.rb') 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 -- cgit v1.2.1