Commit 756a5bab authored by Aleksei Lipniagov's avatar Aleksei Lipniagov

Fix config setup

parent 93395089
......@@ -83,7 +83,7 @@ worker_timeout 60
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))
nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK']
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
......
......@@ -73,7 +73,7 @@ worker_timeout 60
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))
nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK']
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
......
......@@ -83,7 +83,7 @@ worker_timeout 60
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))
nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK']
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment