aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-04 09:34:19 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-04 09:34:19 -0800
commite094b8d251550128a2986b9efed7ab725b439546 (patch)
treec57f032efcb48d7b291755ca76d393339b199615
parente2e4216d645ce32ad11b2a681b45c85025de3d1d (diff)
parenta19f8b5ca04d2519a2f823a640e0c9bf155bdee6 (diff)
downloadrails-e094b8d251550128a2986b9efed7ab725b439546.tar.gz
rails-e094b8d251550128a2986b9efed7ab725b439546.tar.bz2
rails-e094b8d251550128a2986b9efed7ab725b439546.zip
Merge pull request #4299 from Karunakar/logger
using the active support logger
-rw-r--r--activesupport/lib/active_support/deprecation/behaviors.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb
index f9505a247c..80dcaf5613 100644
--- a/activesupport/lib/active_support/deprecation/behaviors.rb
+++ b/activesupport/lib/active_support/deprecation/behaviors.rb
@@ -34,8 +34,8 @@ module ActiveSupport
if defined?(Rails) && Rails.logger
Rails.logger
else
- require 'logger'
- Logger.new($stderr)
+ require 'active_support/logger'
+ ActiveSupport::Logger.new($stderr)
end
logger.warn message
logger.debug callstack.join("\n ") if debug