aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-21 10:56:43 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-21 10:56:43 -0800
commitabdb10502294dfb7bd76590f18e6517f9713a9b1 (patch)
treee247fda9f773757281cd4f45392ab35a612fd95b
parentfa3b9fa87334260f6fbf5713492a43f804b07f5b (diff)
parent0fdf02929184bc49d97e645146ae9d06c4464f31 (diff)
downloadrails-abdb10502294dfb7bd76590f18e6517f9713a9b1.tar.gz
rails-abdb10502294dfb7bd76590f18e6517f9713a9b1.tar.bz2
rails-abdb10502294dfb7bd76590f18e6517f9713a9b1.zip
Merge pull request #4115 from Karunakar/action_pack
Action pack logger methods changed to active supoort Logger methods
-rw-r--r--actionpack/lib/action_dispatch/middleware/debug_exceptions.rb2
-rw-r--r--actionpack/lib/action_dispatch/middleware/params_parser.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index dabbabb1e6..b903f98761 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -76,7 +76,7 @@ module ActionDispatch
end
def stderr_logger
- @stderr_logger ||= Logger.new($stderr)
+ @stderr_logger ||= ActiveSupport::Logger.new($stderr)
end
end
end
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 6ded9dbfed..1cb803ffb9 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -69,7 +69,7 @@ module ActionDispatch
end
def logger(env)
- env['action_dispatch.logger'] || Logger.new($stderr)
+ env['action_dispatch.logger'] || ActiveSupport::Logger.new($stderr)
end
end
end