diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
| commit | 3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch) | |
| tree | d5b664aafa7c2b65f470a700431d336d908c0ebc /lib/gitlab/redis | |
| parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/redis')
| -rw-r--r-- | lib/gitlab/redis/wrapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb index 412d00c6939..beceed3fa75 100644 --- a/lib/gitlab/redis/wrapper.rb +++ b/lib/gitlab/redis/wrapper.rb @@ -22,10 +22,10 @@ module Gitlab def pool_size # heuristic constant 5 should be a config setting somewhere -- related to CPU count? size = 5 - if Sidekiq.server? + if Gitlab::Runtime.sidekiq? # the pool will be used in a multi-threaded context size += Sidekiq.options[:concurrency] - elsif defined?(::Puma) + elsif Gitlab::Runtime.puma? size += Puma.cli_config.options[:max_threads] end |