about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-02 21:12:18 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-02 21:12:18 +0200
commit2d07cb57714b7aae96593c8ff293c1c3010a13f9 (patch)
tree70fab70a99571242771d60faad0846f5b0ba6499 /app
parent5b12624847f6a599e1bbb3b24fc87c3b222e6716 (diff)
Catching rack timeout from rails doesn't work
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb8
-rw-r--r--app/views/errors/503.html.haml5
2 files changed, 0 insertions, 13 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index abfb5bb8c..ef9364897 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,7 +12,6 @@ class ApplicationController < ActionController::Base
   rescue_from ActionController::RoutingError, with: :not_found
   rescue_from ActiveRecord::RecordNotFound, with: :not_found
   rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
-  rescue_from Rack::Timeout::RequestExpiryError, Rack::Timeout::RequestTimeoutError, with: :request_timeout
 
   before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
   before_action :set_locale
@@ -70,13 +69,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def request_timeout
-    respond_to do |format|
-      format.any  { head 503 }
-      format.html { render 'errors/503', layout: 'error', status: 503 }
-    end
-  end
-
   def current_account
     @current_account ||= current_user.try(:account)
   end
diff --git a/app/views/errors/503.html.haml b/app/views/errors/503.html.haml
deleted file mode 100644
index f88d50d36..000000000
--- a/app/views/errors/503.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- content_for :page_title do
-  Request timeout
-
-- content_for :content do
-  It took too long to process your request. This might be a temporary server issue