diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-11 12:45:33 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-11 12:45:33 +0000 |
| commit | 6ce54084bd1426a7d5f49fa90d1186b4e3db7fbf (patch) | |
| tree | df6d6218042f552afdf0d40ff5578c507b8a000d /config | |
| parent | 04bcbaa5e1c02cda6606ad48cb4fecf40e93225c (diff) | |
| parent | b7ea4bd853e4735be68b7438815c02aa56f51a15 (diff) | |
| download | gitlab-ce-6ce54084bd1426a7d5f49fa90d1186b4e3db7fbf.tar.gz | |
Merge branch '490-enable-puma-by-default-in-GDK' into 'master'
Enable puma by default in GDK
Closes gitlab-development-kit#490
See merge request gitlab-org/gitlab-ce!30285
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/rack_timeout.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb index 58f46b55725..246cf3482a4 100644 --- a/config/initializers/rack_timeout.rb +++ b/config/initializers/rack_timeout.rb @@ -14,8 +14,8 @@ if defined?(::Puma) && !Rails.env.test? Gitlab::Application.configure do |config| config.middleware.insert_before(Rack::Runtime, Rack::Timeout, - service_timeout: 60, - wait_timeout: 90) + service_timeout: ENV.fetch('GITLAB_RAILS_RACK_TIMEOUT', 60).to_i, + wait_timeout: ENV.fetch('GITLAB_RAILS_WAIT_TIMEOUT', 90).to_i) end observer = Gitlab::Cluster::RackTimeoutObserver.new |