From bfe3f06b53a1444aa346962e47d13b90782b87a3 Mon Sep 17 00:00:00 2001 From: Nick Muerdter Date: Fri, 26 May 2017 15:42:22 -0600 Subject: [PATCH] Increase default Puma timeout, and make it configurable via YAML. This allows for configuring if Elasticsearch is slower to respond than 15 seconds, since those API requests can sometimes take longer. --- config/default.yml | 1 + src/api-umbrella/web-app/config/initializers/timeout.rb | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config/default.yml b/config/default.yml index a2a355a8a..e1b8a54e8 100644 --- a/config/default.yml +++ b/config/default.yml @@ -75,6 +75,7 @@ web: host: 127.0.0.1 port: 14012 rails_secret_token: + request_timeout: 30 puma: workers: 2 min_threads: 2 diff --git a/src/api-umbrella/web-app/config/initializers/timeout.rb b/src/api-umbrella/web-app/config/initializers/timeout.rb index 36403d10b..2935ee1f0 100644 --- a/src/api-umbrella/web-app/config/initializers/timeout.rb +++ b/src/api-umbrella/web-app/config/initializers/timeout.rb @@ -1,8 +1,4 @@ -if(Rails.env.development?) - Rack::Timeout.timeout = 60 # seconds -else - Rack::Timeout.timeout = 15 # seconds -end +Rack::Timeout.timeout = ApiUmbrellaConfig[:web][:request_timeout] # seconds Rack::Timeout::Logger.device = $stderr Rack::Timeout::Logger.level = Logger::ERROR