ActionController::Logger should include AbstractController::Logger and sort autoloads for easier readability.

3 files changed, 11 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d3dc90f377..d66fc3fcc9 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -13,29 +13,29 @@ module ActionController
   autoload :Middleware
 
   autoload_under "metal" do
+    autoload :Compatibility
     autoload :ConditionalGet
     autoload :Configuration
+    autoload :Cookies
+    autoload :FilterParameterLogging
+    autoload :Flash
     autoload :Head
     autoload :Helpers
     autoload :HideActions
+    autoload :HttpAuthentication
     autoload :Logger
     autoload :MimeResponds
     autoload :RackDelegation
-    autoload :Compatibility
     autoload :Redirecting
     autoload :Rendering
     autoload :Renderers
+    autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
     autoload :SessionManagement
+    autoload :Streaming
     autoload :UrlFor
     autoload :Verification
-    autoload :Flash
-    autoload :RequestForgeryProtection
-    autoload :Streaming
-    autoload :HttpAuthentication
-    autoload :FilterParameterLogging
-    autoload :Cookies
   end
 
   autoload :Dispatcher,      'action_controller/dispatch/dispatcher'
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 7a2e27ce86..b23be66910 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -3,7 +3,6 @@ module ActionController
     abstract!
 
     include AbstractController::Callbacks
-    include AbstractController::Logger
     include AbstractController::Layouts
 
     include ActionController::Helpers
diff --git a/actionpack/lib/action_controller/metal/logger.rb b/actionpack/lib/action_controller/metal/logger.rb
index e71f77fbb2..4f4370e5f0 100644
--- a/actionpack/lib/action_controller/metal/logger.rb
+++ b/actionpack/lib/action_controller/metal/logger.rb
@@ -8,6 +8,10 @@ module ActionController
   module Logger
     extend ActiveSupport::Concern
 
+    included do
+      include AbstractController::Logger
+    end
+
     attr_internal :view_runtime
 
     def process_action(action)