Commit afecae26 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'sh-silence-rack-timeout-log-messages' into 'master'

Silence rack-timeout INFO messages

See merge request gitlab-org/gitlab!24961
parents e24176da 3c0b1bc2
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
if Gitlab::Runtime.puma? && !Rails.env.test? if Gitlab::Runtime.puma? && !Rails.env.test?
require 'rack/timeout/base' require 'rack/timeout/base'
Rack::Timeout::Logger.level = Logger::ERROR
Gitlab::Application.configure do |config| Gitlab::Application.configure do |config|
config.middleware.insert_before(Rack::Runtime, Rack::Timeout, config.middleware.insert_before(Rack::Runtime, Rack::Timeout,
service_timeout: ENV.fetch('GITLAB_RAILS_RACK_TIMEOUT', 60).to_i, service_timeout: ENV.fetch('GITLAB_RAILS_RACK_TIMEOUT', 60).to_i,
......
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