diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /lib/gitlab/runtime.rb | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'lib/gitlab/runtime.rb')
-rw-r--r-- | lib/gitlab/runtime.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb index f74f1489405..269fb74ceca 100644 --- a/lib/gitlab/runtime.rb +++ b/lib/gitlab/runtime.rb @@ -78,16 +78,16 @@ module Gitlab def puma_in_clustered_mode? return unless puma? - return unless Puma.respond_to?(:cli_config) + return unless ::Puma.respond_to?(:cli_config) - Puma.cli_config.options[:workers].to_i > 0 + ::Puma.cli_config.options[:workers].to_i > 0 end def max_threads threads = 1 # main thread - if puma? && Puma.respond_to?(:cli_config) - threads += Puma.cli_config.options[:max_threads] + if puma? && ::Puma.respond_to?(:cli_config) + threads += ::Puma.cli_config.options[:max_threads] elsif sidekiq? # 2 extra threads for the pollers in Sidekiq and Sidekiq Cron: # https://github.com/ondrejbartas/sidekiq-cron#under-the-hood |