mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
b76b817629
There was some subtle breakage caused by #18774, when we removed `#original_exception` in favor of `#cause`. However, `#cause` is automatically set by Ruby when raising an exception from a rescue block. With this change, we will use whichever handler has the highest priority (whichever call to `rescue_from` came last). In cases where the outer has lower precidence than the cause, but the outer is what should be handled, cause will need to be explicitly unset. Fixes #23925
37 lines
1.3 KiB
Ruby
37 lines
1.3 KiB
Ruby
module ActionController #:nodoc:
|
|
# This module is responsible to provide `rescue_from` helpers
|
|
# to controllers and configure when detailed exceptions must be
|
|
# shown.
|
|
module Rescue
|
|
extend ActiveSupport::Concern
|
|
include ActiveSupport::Rescuable
|
|
|
|
def rescue_with_handler(exception)
|
|
if exception.cause
|
|
handler_index = index_of_handler_for_rescue(exception) || Float::INFINITY
|
|
cause_handler_index = index_of_handler_for_rescue(exception.cause)
|
|
if cause_handler_index && cause_handler_index <= handler_index
|
|
exception = exception.cause
|
|
end
|
|
end
|
|
super(exception)
|
|
end
|
|
|
|
# Override this method if you want to customize when detailed
|
|
# exceptions must be shown. This method is only called when
|
|
# consider_all_requests_local is false. By default, it returns
|
|
# false, but someone may set it to `request.local?` so local
|
|
# requests in production still shows the detailed exception pages.
|
|
def show_detailed_exceptions?
|
|
false
|
|
end
|
|
|
|
private
|
|
def process_action(*args)
|
|
super
|
|
rescue Exception => exception
|
|
request.env['action_dispatch.show_detailed_exceptions'] ||= show_detailed_exceptions?
|
|
rescue_with_handler(exception) || raise(exception)
|
|
end
|
|
end
|
|
end
|