From 9efd330edfffd5996f6fe287dea46cec086df4cd Mon Sep 17 00:00:00 2001 From: Aleksei Lipniagov <alipniagov@gitlab.com> Date: Thu, 21 Jan 2021 21:48:34 +0000 Subject: [PATCH] Disable nakayoshi_fork by default in examples --- .../unreleased/alipniagov-disable-nakayoshi-by-default.yml | 5 +++++ config/puma.example.development.rb | 2 +- config/puma.rb.example | 2 +- config/puma_actioncable.example.development.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/alipniagov-disable-nakayoshi-by-default.yml diff --git a/changelogs/unreleased/alipniagov-disable-nakayoshi-by-default.yml b/changelogs/unreleased/alipniagov-disable-nakayoshi-by-default.yml new file mode 100644 index 000000000000..e767f3908398 --- /dev/null +++ b/changelogs/unreleased/alipniagov-disable-nakayoshi-by-default.yml @@ -0,0 +1,5 @@ +--- +title: Disable nakayoshi_fork by default in examples +merge_request: 52209 +author: +type: other diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 28c2af3acb33..1901b5a0c1c3 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -86,7 +86,7 @@ # 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' + nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' end # Use json formatter diff --git a/config/puma.rb.example b/config/puma.rb.example index 9fc354a8fe82..6684919e9120 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -76,7 +76,7 @@ end # 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' + nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' end # Use json formatter diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb index d0da3dcd8f2d..a12b45238484 100644 --- a/config/puma_actioncable.example.development.rb +++ b/config/puma_actioncable.example.development.rb @@ -86,7 +86,7 @@ # 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' + nakayoshi_fork if ENV['ENABLE_PUMA_NAKAYOSHI_FORK'] == 'true' end # Use json formatter -- GitLab