aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-20 11:56:38 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-20 11:57:07 -0800
commit983bf6d456d29bfb9c8b497991e65682ca4d1ce4 (patch)
tree701963a88a48be9f4142904cc17b28c4eeb6cbec /activerecord/lib/active_record
parent14d1029aa342df46f61f22241359deffb9d5b9a4 (diff)
downloadrails-983bf6d456d29bfb9c8b497991e65682ca4d1ce4.tar.gz
rails-983bf6d456d29bfb9c8b497991e65682ca4d1ce4.tar.bz2
rails-983bf6d456d29bfb9c8b497991e65682ca4d1ce4.zip
restored logging to the log file and display on the console
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/railtie.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index b1c8ae5b77..71b91412a3 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -38,7 +38,9 @@ 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 = ActiveSupport::Logger.new(STDERR)
+ console = ActiveSupport::Logger.new(STDERR)
+ logger = ActiveSupport::BroadcastLogger.new [Rails.logger, console]
+ ActiveRecord::Base.logger = logger
end
initializer "active_record.initialize_timezone" do