diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-02 18:16:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-02 18:16:07 +0300 |
commit | f38683df1f619b2a1960e1415b9326354a4b5327 (patch) | |
tree | 23d469a81d3d1866a2ab71ba406aa84cd954f99a /lib/gitlab/runtime.rb | |
parent | 5bc7c18ad37cde0ffdf1aa4ba2cee27c92ec69f6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/runtime.rb')
-rw-r--r-- | lib/gitlab/runtime.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb index 574e05658bc..5b1341207fd 100644 --- a/lib/gitlab/runtime.rb +++ b/lib/gitlab/runtime.rb @@ -65,12 +65,15 @@ module Gitlab !!defined?(::Rails::Command::RunnerCommand) end - def web_server? - puma? + # Whether we are executing in an actual application context i.e. Puma or Sidekiq. + def application? + puma? || sidekiq? end + # Whether we are executing in a multi-threaded environment. For now this is equivalent + # to meaning Puma or Sidekiq, but this could change in the future. def multi_threaded? - puma? || sidekiq? + application? end def puma_in_clustered_mode? @@ -94,7 +97,7 @@ module Gitlab threads += Sidekiq.options[:concurrency] + 2 end - if web_server? + if puma? threads += Gitlab::ActionCable::Config.worker_pool_size end |