4 files changed, 58 insertions, 59 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 8611d0d3c3..a70ba0d2e3 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1,3 +1,5 @@
+require "action_controller/log_subscriber"
+
 module ActionController
   class Base < Metal
     abstract!
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
new file mode 100644
index 0000000000..ece270b3ce
--- /dev/null
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -0,0 +1,56 @@
+require 'active_support/core_ext/object/blank'
+
+module ActionController
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    INTERNAL_PARAMS = %w(controller action format _method only_path)
+
+    def start_processing(event)
+      payload = event.payload
+      params  = payload[:params].except(*INTERNAL_PARAMS)
+
+      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
+      info "  Parameters: #{params.inspect}" unless params.empty?
+    end
+
+    def process_action(event)
+      payload   = event.payload
+      additions = ActionController::Base.log_process_action(payload)
+
+      message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration
+      message << " (#{additions.join(" | ")})" unless additions.blank?
+
+      info(message)
+    end
+
+    def send_file(event)
+      message = "Sent file %s"
+      message << " (%.1fms)"
+      info(message % [event.payload[:path], event.duration])
+    end
+
+    def redirect_to(event)
+      info "Redirected to #{event.payload[:location]}"
+    end
+
+    def send_data(event)
+      info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
+    end
+
+    %w(write_fragment read_fragment exist_fragment?
+       expire_fragment expire_page write_page).each do |method|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(event)
+          key_or_path = event.payload[:key] || event.payload[:path]
+          human_name  = #{method.to_s.humanize.inspect}
+          info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
+        end
+      METHOD
+    end
+
+    def logger
+      ActionController::Base.logger
+    end
+  end
+end
+
+ActionController::LogSubscriber.attach_to :action_controller
+\ No newline at end of file
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 0e3cdffadc..86395c4d93 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -6,7 +6,6 @@ require "active_support/core_ext/class/subclasses"
 require "active_support/deprecation/proxy_wrappers"
 require "active_support/deprecation"
 
-require "action_controller/railties/log_subscriber"
 require "action_controller/railties/url_helpers"
 
 module ActionController
@@ -35,8 +34,6 @@ module ActionController
       end
     end
 
-    log_subscriber :action_controller, ActionController::Railties::LogSubscriber.new
-
     initializer "action_controller.set_configs" do |app|
       paths = app.config.paths
       ac = app.config.action_controller
diff --git a/actionpack/lib/action_controller/railties/log_subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
deleted file mode 100644
index 00ac3bdf67..0000000000
--- a/actionpack/lib/action_controller/railties/log_subscriber.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'active_support/core_ext/object/blank'
-
-module ActionController
-  module Railties
-    class LogSubscriber < Rails::LogSubscriber
-      INTERNAL_PARAMS = %w(controller action format _method only_path)
-
-      def start_processing(event)
-        payload = event.payload
-        params  = payload[:params].except(*INTERNAL_PARAMS)
-
-        info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
-        info "  Parameters: #{params.inspect}" unless params.empty?
-      end
-
-      def process_action(event)
-        payload   = event.payload
-        additions = ActionController::Base.log_process_action(payload)
-
-        message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration
-        message << " (#{additions.join(" | ")})" unless additions.blank?
-
-        info(message)
-      end
-
-      def send_file(event)
-        message = "Sent file %s"
-        message << " (%.1fms)"
-        info(message % [event.payload[:path], event.duration])
-      end
-
-      def redirect_to(event)
-        info "Redirected to #{event.payload[:location]}"
-      end
-
-      def send_data(event)
-        info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
-      end
-
-      %w(write_fragment read_fragment exist_fragment?
-         expire_fragment expire_page write_page).each do |method|
-        class_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def #{method}(event)
-            key_or_path = event.payload[:key] || event.payload[:path]
-            human_name  = #{method.to_s.humanize.inspect}
-            info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
-          end
-        METHOD
-      end
-
-      def logger
-        ActionController::Base.logger
-      end
-    end
-  end
-end
-\ No newline at end of file