diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-05 12:03:10 -0800 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-05 12:03:10 -0800 |
commit | 013d959917a3f682f921dc6af726fa2136285bed (patch) | |
tree | d1efcdbf5bfa347a5fbb436d4db61f962382d8a2 /activerecord | |
parent | 4d08324aac7a50bbaa8f6200f50e8a7f6ff3ce48 (diff) | |
parent | 00236435221a39441af3f1e76110767fba4154a8 (diff) | |
download | rails-013d959917a3f682f921dc6af726fa2136285bed.tar.gz rails-013d959917a3f682f921dc6af726fa2136285bed.tar.bz2 rails-013d959917a3f682f921dc6af726fa2136285bed.zip |
Merge pull request #4303 from Karunakar/logger
Moved the logger methods in activeresource/test/abstract_unit.rb
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/README.rdoc | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 6f9f63ceee..30a66ff5f0 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -143,7 +143,7 @@ A short rundown of some of the major features: * Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc]. - ActiveRecord::Base.logger = Logger.new(STDOUT) + ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) ActiveRecord::Base.logger = Log4r::Logger.new("Application Log") diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 165d0750dd..b1c8ae5b77 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -38,7 +38,7 @@ module ActiveRecord # first time. Also, make it output to STDERR. console do |app| require "active_record/railties/console_sandbox" if app.sandbox? - ActiveRecord::Base.logger = Logger.new(STDERR) + ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDERR) end initializer "active_record.initialize_timezone" do |