diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 7e616ee476807bf41a424d4fcdf179c9155501b4..95a10dd1dfd4d6d34e6e405f8ce012d423d905c0 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -80,9 +80,10 @@ 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 +nakayoshi_fork ActiveModel::Type::Boolean.new.cast(ENV.fetch('PUMA_NAKAYOSHI_FORK_ENABLED', 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 25e38626260701607f4db8ec730e24dd90ff3516..073533912ec1723a3c4b4eb6e12e98edf62195ae 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -70,9 +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 +nakayoshi_fork ActiveModel::Type::Boolean.new.cast(ENV.fetch('PUMA_NAKAYOSHI_FORK_ENABLED', 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 106932606e0e2d8d844858f19ff472c39d1bd766..4ca1d0a3cd50b6f4673af240b549554673e366cb 100644 --- a/config/puma_actioncable.example.development.rb +++ b/config/puma_actioncable.example.development.rb @@ -80,9 +80,10 @@ 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 +nakayoshi_fork ActiveModel::Type::Boolean.new.cast(ENV.fetch('PUMA_NAKAYOSHI_FORK_ENABLED', true)) # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"