diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-config_puma.rb.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_puma.rb.example | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/www/gitlab-ce/files/patch-config_puma.rb.example b/www/gitlab-ce/files/patch-config_puma.rb.example index fd303f352d69..ca75ff90f250 100644 --- a/www/gitlab-ce/files/patch-config_puma.rb.example +++ b/www/gitlab-ce/files/patch-config_puma.rb.example @@ -1,4 +1,4 @@ ---- config/puma.rb.example.orig 2023-06-21 08:07:20 UTC +--- config/puma.rb.example.orig 2023-10-20 08:41:39 UTC +++ config/puma.rb.example @@ -5,11 +5,11 @@ # The default is "config.ru". @@ -30,7 +30,7 @@ on_restart do # Signal application hooks that we're about to restart -@@ -74,7 +74,7 @@ worker_timeout 60 +@@ -74,14 +74,14 @@ worker_timeout 60 wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter @@ -39,3 +39,11 @@ json_formatter = Gitlab::PumaLogging::JSONFormatter.new log_formatter do |str| + json_formatter.call(str) + end + +-require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler" ++require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/puma/error_handler" + + error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production') + |