diff options
Diffstat (limited to 'config/puma.rb.example')
| -rw-r--r-- | config/puma.rb.example | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/config/puma.rb.example b/config/puma.rb.example index d474fc70500..07a6f6a2501 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -36,7 +36,6 @@ bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket' workers 3 require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" -require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" on_restart do # Signal application hooks that we're about to restart @@ -44,9 +43,6 @@ on_restart do end before_fork do - # Signal to the puma killer - Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER'] - # Signal application hooks that we're about to fork Gitlab::Cluster::LifecycleEvents.do_before_fork end @@ -77,13 +73,6 @@ worker_timeout 60 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f -# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258 -# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork -if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 && - ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true' - nakayoshi_fork -end - # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" |