logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 2d07cb57714b7aae96593c8ff293c1c3010a13f9
parent: 5b12624847f6a599e1bbb3b24fc87c3b222e6716
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  2 Apr 2017 21:12:18 +0200

Catching rack timeout from rails doesn't work

Diffstat:

Mapp/controllers/application_controller.rb8--------
Dapp/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 @@ -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 @@ -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