Skip to content

Commit c912cc5

Browse files
balasankarcstanhu
andcommitted
Merge branch 'sh-drop-nakayoshi-fork-config' into 'master'
Drop DISABLE_PUMA_NAKAYOSHI_FORK from Puma config See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7123 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Clemens Beck <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Stan Hu <[email protected]>
2 parents 825f393 + d239d8f commit c912cc5

File tree

1 file changed

+0
-7
lines changed
  • files/gitlab-cookbooks/gitlab/templates/default

1 file changed

+0
-7
lines changed

files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,6 @@ worker_timeout <%= @worker_timeout %>
112112
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
113113
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
114114

115-
# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258
116-
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
117-
if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 &&
118-
ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true'
119-
nakayoshi_fork
120-
end
121-
122115
# Use customised JSON formatter for Puma log
123116
require_relative "<%= @install_dir %>/embedded/service/gitlab-rails/lib/gitlab/puma_logging/json_formatter"
124117

0 commit comments

Comments
 (0)