1 files changed, 9 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 226a688fe2..66bb74b9c5 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -55,18 +55,17 @@ module ActionDispatch
       response
     rescue Exception => exception
       raise exception unless request.show_exceptions?
-      render_exception(env, exception)
+      render_exception(request, exception)
     end
 
     private
 
-    def render_exception(env, exception)
-      backtrace_cleaner = env['action_dispatch.backtrace_cleaner']
+    def render_exception(request, exception)
+      backtrace_cleaner = request.get_header('action_dispatch.backtrace_cleaner')
       wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
-      log_error(env, wrapper)
+      log_error(request, wrapper)
 
-      if env['action_dispatch.show_detailed_exceptions']
-        request = Request.new(env)
+      if request.get_header('action_dispatch.show_detailed_exceptions')
         traces = wrapper.traces
 
         trace_to_show = 'Application Trace'
@@ -108,8 +107,8 @@ module ActionDispatch
       [status, {'Content-Type' => "#{format}; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
     end
 
-    def log_error(env, wrapper)
-      logger = logger(env)
+    def log_error(request, wrapper)
+      logger = logger(request)
       return unless logger
 
       exception = wrapper.exception
@@ -125,8 +124,8 @@ module ActionDispatch
       end
     end
 
-    def logger(env)
-      env['action_dispatch.logger'] || stderr_logger
+    def logger(request)
+      request.logger || stderr_logger
     end
 
     def stderr_logger