1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index f15c012471..29a0a346ec 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -8,17 +8,16 @@ module ActionController
     require "action_controller/railties/subscriber"
     subscriber ActionController::Railties::Subscriber.new
 
+    initializer "action_controller.logger" do
+      ActionController::Base.logger ||= Rails.logger
+    end
+
     initializer "action_controller.set_configs" do |app|
       app.config.action_controller.each do |k,v|
         ActionController::Base.send "#{k}=", v
       end
     end
 
-    # TODO: ActionController::Base.logger should delegate to its own config.logger
-    initializer "action_controller.logger" do
-      ActionController::Base.logger ||= Rails.logger
-    end
-
     initializer "action_controller.initialize_framework_caches" do
       ActionController::Base.cache_store ||= RAILS_CACHE
     end