lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-6.0.0.beta3 vs lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-6.0.0.rc1

- old
+ new

@@ -2,10 +2,12 @@ require "action_dispatch/http/request" require "action_dispatch/middleware/exception_wrapper" require "action_dispatch/routing/inspector" +require "active_support/actionable_error" + require "action_view" require "action_view/base" module ActionDispatch # This middleware is responsible for logging exceptions and @@ -58,11 +60,15 @@ backtrace_cleaner = request.get_header("action_dispatch.backtrace_cleaner") wrapper = ExceptionWrapper.new(backtrace_cleaner, exception) log_error(request, wrapper) if request.get_header("action_dispatch.show_detailed_exceptions") - content_type = request.formats.first + begin + content_type = request.formats.first + rescue Mime::Type::InvalidMimeType + render_for_api_request(Mime[:text], wrapper) + end if api_request?(content_type) render_for_api_request(content_type, wrapper) else render_for_browser_request(request, wrapper) @@ -140,10 +146,10 @@ ActiveSupport::Deprecation.silence do message = [] message << " " message << "#{exception.class} (#{exception.message}):" - message.concat(exception.annoted_source_code) if exception.respond_to?(:annoted_source_code) + message.concat(exception.annotated_source_code) if exception.respond_to?(:annotated_source_code) message << " " message.concat(trace) log_array(logger, message) end