diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 21:06:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 21:06:24 +0300 |
| commit | eca3cd3a9e7d9ea680086cad8150050ec8cdef3f (patch) | |
| tree | c3d262e0d8e721fc138c2d617f501fb09876f1b6 /lib/gitlab/redis | |
| parent | 6e81d7f6283fae1b22f66b9d9b133243921cbd9e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/redis')
| -rw-r--r-- | lib/gitlab/redis/wrapper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb index fa1615a5953..412d00c6939 100644 --- a/lib/gitlab/redis/wrapper.rb +++ b/lib/gitlab/redis/wrapper.rb @@ -25,6 +25,8 @@ module Gitlab if Sidekiq.server? # the pool will be used in a multi-threaded context size += Sidekiq.options[:concurrency] + elsif defined?(::Puma) + size += Puma.cli_config.options[:max_threads] end size |