From f0523f72b46db14e2f50c8347a8708734c650f84 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Mon, 15 Feb 2010 21:44:30 +0700
Subject: Rename Rails::Subscriber to Rails::LogSubscriber

---
 actionpack/lib/action_controller/railtie.rb        |  4 +-
 .../action_controller/railties/log_subscriber.rb   | 62 ++++++++++++++++++++++
 .../lib/action_controller/railties/subscriber.rb   | 62 ----------------------
 3 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 actionpack/lib/action_controller/railties/log_subscriber.rb
 delete mode 100644 actionpack/lib/action_controller/railties/subscriber.rb

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 55a5c22ac0..015a8212c4 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -6,8 +6,8 @@ module ActionController
   class Railtie < Rails::Railtie
     railtie_name :action_controller
 
-    require "action_controller/railties/subscriber"
-    subscriber ActionController::Railties::Subscriber.new
+    require "action_controller/railties/log_subscriber"
+    log_subscriber ActionController::Railties::LogSubscriber.new
 
     initializer "action_controller.logger" do
       ActionController::Base.logger ||= Rails.logger
diff --git a/actionpack/lib/action_controller/railties/log_subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
new file mode 100644
index 0000000000..df9ffa1717
--- /dev/null
+++ b/actionpack/lib/action_controller/railties/log_subscriber.rb
@@ -0,0 +1,62 @@
+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 = if event.payload[:x_sendfile]
+          header = ActionController::Streaming::X_SENDFILE_HEADER
+          "Sent #{header} header %s"
+        elsif event.payload[:stream]
+          "Streamed file %s"
+        else
+          "Sent file %s"
+        end
+
+        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
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/subscriber.rb
deleted file mode 100644
index 4499e82292..0000000000
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-module ActionController
-  module Railties
-    class Subscriber < Rails::Subscriber
-      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 = if event.payload[:x_sendfile]
-          header = ActionController::Streaming::X_SENDFILE_HEADER
-          "Sent #{header} header %s"
-        elsif event.payload[:stream]
-          "Streamed file %s"
-        else
-          "Sent file %s"
-        end
-
-        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
-- 
cgit v1.2.3