4 files changed, 28 insertions, 30 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 50df1c97b2..956c88a553 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -3,6 +3,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/ordered_options'
+require 'action_view/log_subscriber'
 
 module ActionView #:nodoc:
   class NonConcattingString < ActiveSupport::SafeBuffer
diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb
new file mode 100644
index 0000000000..4a52937c58
--- /dev/null
+++ b/actionpack/lib/action_view/log_subscriber.rb
@@ -0,0 +1,27 @@
+module ActionView
+  # = Action View Log Subscriber
+  #
+  # Provides functionality so that Rails can output logs from Action View.
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def render_template(event)
+      message = "Rendered #{from_rails_root(event.payload[:identifier])}"
+      message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
+      message << (" (%.1fms)" % event.duration)
+      info(message)        
+    end
+    alias :render_partial :render_template
+    alias :render_collection :render_template
+
+    def logger
+      ActionController::Base.logger
+    end
+
+  protected
+
+    def from_rails_root(string)
+      string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
+    end
+  end
+end
+
+ActionView::LogSubscriber.attach_to :action_view
+\ No newline at end of file
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 8c7b7d64c2..33dfcbb803 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -8,9 +8,6 @@ module ActionView
     config.action_view.stylesheet_expansions = {}
     config.action_view.javascript_expansions = { :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails'] }
 
-    require "action_view/railties/log_subscriber"
-    log_subscriber :action_view, ActionView::Railties::LogSubscriber.new
-
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
         ActiveSupport.on_load(:action_view) do
diff --git a/actionpack/lib/action_view/railties/log_subscriber.rb b/actionpack/lib/action_view/railties/log_subscriber.rb
deleted file mode 100644
index cb2ad0711e..0000000000
--- a/actionpack/lib/action_view/railties/log_subscriber.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module ActionView
-  # = Action View Log Subscriber
-  #
-  # Provides functionality so that Rails can output logs from Action View.
-  module Railties
-    class LogSubscriber < Rails::LogSubscriber
-      def render_template(event)
-        message = "Rendered #{from_rails_root(event.payload[:identifier])}"
-        message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
-        message << (" (%.1fms)" % event.duration)
-        info(message)        
-      end
-      alias :render_partial :render_template
-      alias :render_collection :render_template
-
-      def logger
-        ActionController::Base.logger
-      end
-
-    protected
-
-      def from_rails_root(string)
-        string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
-      end
-    end
-  end
-end
-\ No newline at end of file