From cd9d28d6fdff6819dac3c6643fe882eb568b5a39 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Thu, 24 Nov 2011 22:37:48 +0300
Subject: middlewares should use logger from env

---
 .../lib/action_dispatch/middleware/params_parser.rb      |  6 +++---
 .../lib/action_dispatch/middleware/show_exceptions.rb    | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'actionpack/lib/action_dispatch/middleware')

diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 84e3dd16dd..6ded9dbfed 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -52,7 +52,7 @@ module ActionDispatch
           false
         end
       rescue Exception => e # YAML, XML or Ruby code block errors
-        logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
+        logger(env).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
         raise e
       end
@@ -68,8 +68,8 @@ module ActionDispatch
         nil
       end
 
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      def logger(env)
+        env['action_dispatch.logger'] || Logger.new($stderr)
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 52dce4cc81..8dc2820d37 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -63,7 +63,7 @@ module ActionDispatch
 
     private
       def render_exception(env, exception)
-        log_error(exception)
+        log_error(env, exception)
         exception = original_exception(exception)
 
         if env['action_dispatch.show_detailed_exceptions'] == true
@@ -124,14 +124,14 @@ module ActionDispatch
         defined?(Rails.public_path) ? Rails.public_path : 'public_path'
       end
 
-      def log_error(exception)
-        return unless logger
+      def log_error(env, exception)
+        return unless logger(env)
 
         ActiveSupport::Deprecation.silence do
           message = "\n#{exception.class} (#{exception.message}):\n"
           message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
           message << "  " << application_trace(exception).join("\n  ")
-          logger.fatal("#{message}\n\n")
+          logger(env).fatal("#{message}\n\n")
         end
       end
 
@@ -153,8 +153,12 @@ module ActionDispatch
           exception.backtrace
       end
 
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      def logger(env)
+        env['action_dispatch.logger'] || stderr_logger
+      end
+
+      def stderr_logger
+        Logger.new($stderr)
       end
 
     def original_exception(exception)
-- 
cgit v1.2.3