diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /config/puma.example.development.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'config/puma.example.development.rb')
-rw-r--r-- | config/puma.example.development.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 28c2af3acb3..ad33250011e 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -80,14 +80,10 @@ tag 'gitlab-puma-worker' worker_timeout 60 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput -if defined?(wait_for_less_busy_worker) - wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f -end +wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork -if defined?(nakayoshi_fork) - nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' -end +nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" |