diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
| commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
| tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /config/puma.example.development.rb | |
| parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'config/puma.example.development.rb')
| -rw-r--r-- | config/puma.example.development.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 1b75238112f..e7dacc70c2e 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -53,10 +53,6 @@ on_restart do end before_fork do - # Signal to the puma killer - enable_puma_worker_killer = !Gitlab::Utils.to_boolean(ENV['DISABLE_PUMA_WORKER_KILLER']) - Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options) if enable_puma_worker_killer - # Signal application hooks that we're about to fork Gitlab::Cluster::LifecycleEvents.do_before_fork end @@ -88,13 +84,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" |