about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-02 19:43:09 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-02 19:43:44 +0200
commit5b12624847f6a599e1bbb3b24fc87c3b222e6716 (patch)
treef6fda89ae5288e5e48d12c534562f10aca290f11 /config
parent34ff11c49600e2ca8547f4044f2c73b33aa70c34 (diff)
Add proper error page for request timeouts
Diffstat (limited to 'config')
-rw-r--r--config/initializers/timeout.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb
index 06a29492e..de87fd906 100644
--- a/config/initializers/timeout.rb
+++ b/config/initializers/timeout.rb
@@ -1,4 +1,6 @@
+Rack::Timeout::Logger.disable
+Rack::Timeout.service_timeout = false
+
 if Rails.env.production?
   Rack::Timeout.service_timeout = 90
-  Rack::Timeout::Logger.disable
 end