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.
NREL · May 26, 2017 · bfe3f06 · bfe3f06
1 parent 25691cb
commit bfe3f06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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