diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:46 +0300 |
| commit | aa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f (patch) | |
| tree | 4a662bc77fb43e1d1deec78cc7a95d911c0da1c5 /lib/gitlab/redis | |
| parent | d47f9d2304dbc3a23bba7fe7a5cd07218eeb41cd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/redis')
| -rw-r--r-- | lib/gitlab/redis/wrapper.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb index beceed3fa75..c8932b26925 100644 --- a/lib/gitlab/redis/wrapper.rb +++ b/lib/gitlab/redis/wrapper.rb @@ -22,11 +22,8 @@ module Gitlab def pool_size # heuristic constant 5 should be a config setting somewhere -- related to CPU count? size = 5 - if Gitlab::Runtime.sidekiq? - # the pool will be used in a multi-threaded context - size += Sidekiq.options[:concurrency] - elsif Gitlab::Runtime.puma? - size += Puma.cli_config.options[:max_threads] + if Gitlab::Runtime.multi_threaded? + size += Gitlab::Runtime.max_threads end size |