diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 15:10:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-17 15:10:23 +0300 |
| commit | a62238de7302e54edafa3407a2dc8ba1a5f96e4d (patch) | |
| tree | 17dba82a469067bd07aeb7910138ce5ae23d835f /config | |
| parent | 170926ba283d7785f2fc53f05d4adc0df7617325 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/puma.example.development.rb | 8 | ||||
| -rw-r--r-- | config/puma.rb.example | 8 | ||||
| -rw-r--r-- | config/puma_actioncable.example.development.rb | 8 |
3 files changed, 6 insertions, 18 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" diff --git a/config/puma.rb.example b/config/puma.rb.example index 9fc354a8fe8..f659529f23f 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -70,14 +70,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" diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb index d0da3dcd8f2..1e1f09cc601 100644 --- a/config/puma_actioncable.example.development.rb +++ b/config/puma_actioncable.example.development.rb @@ -80,14 +80,10 @@ tag 'gitlab-actioncable-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" |