Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/redis/wrapper.rb')
-rw-r--r--lib/gitlab/redis/wrapper.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index bb231eec226..b2494c7d43c 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -30,7 +30,12 @@ module Gitlab
end
def pool
- @pool ||= ConnectionPool.new(size: pool_size, name: store_name.underscore) { redis }
+ @pool ||= if config_fallback &&
+ config_fallback.params.except(:instrumentation_class) == params.except(:instrumentation_class)
+ config_fallback.pool
+ else
+ ConnectionPool.new(size: pool_size, name: store_name.underscore) { redis }
+ end
end
def pool_size