aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 7b6d792931..18d7cc0187 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -23,6 +23,10 @@ module ActiveRecord
ActiveRecord::Base.default_timezone = :utc
end
+ initializer "active_record.logger" do
+ ActiveRecord::Base.logger ||= ::Rails.logger
+ end
+
initializer "active_record.set_configs" do |app|
app.config.active_record.each do |k,v|
ActiveRecord::Base.send "#{k}=", v
@@ -71,11 +75,6 @@ module ActiveRecord
end
end
- # TODO: ActiveRecord::Base.logger should delegate to its own config.logger
- initializer "active_record.logger" do
- ActiveRecord::Base.logger ||= ::Rails.logger
- end
-
initializer "active_record.i18n_deprecation" do
require 'active_support/i18n'