diff options
| author | Qingyu Zhao <qzhao@gitlab.com> | 2019-07-03 14:11:48 +1000 |
|---|---|---|
| committer | Qingyu Zhao <qzhao@gitlab.com> | 2019-07-09 23:31:32 +1000 |
| commit | b7ea4bd853e4735be68b7438815c02aa56f51a15 (patch) | |
| tree | 91807815689b6e077298dacbf1fecd054a432df0 /config | |
| parent | 8a2c53d6400287bbb29056c4d007ee571b292937 (diff) | |
| download | gitlab-ce-b7ea4bd853e4735be68b7438815c02aa56f51a15.tar.gz | |
Enable puma by default in GDK490-enable-puma-by-default-in-GDK
Two changes:
1. Move bin/web to bin/web_unicorn(removed PUMA switching logic)
Introduce new shadow script bin/web. Now we have 3 scripts working
together: bin/web, bin/web_puma, bin/web_unicorn
In bin/web, it checks ENV['USE_WEB_SERVER']:
- if value is 'puma' or value is not set, call bin/web_puma
- if value is 'unicorn', call bin/web_unicorn
- report error if other values given
2. Gitlab rails allow ENV setting to override timeout
- ENV['GITLAB_RAILS_RACK_TIMEOUT'] for service_timeout
- ENV['GITLAB_RAILS_WAIT_TIMEOUT'] for wait_timeout
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 |