Merge remote branch 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

1 files changed, 60 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/subscriber.rb
new file mode 100644
index 0000000000..a9f5d16c58
--- /dev/null
+++ b/actionpack/lib/action_controller/railties/subscriber.rb
@@ -0,0 +1,60 @@
+module ActionController
+  module Railties
+    class Subscriber < Rails::Subscriber
+      def process_action(event)
+        payload = event.payload
+
+        info "\nProcessed #{payload[:controller]}##{payload[:action]} " \
+          "to #{payload[:formats].join(', ')} (for #{payload[:remote_ip]} at #{event.time.to_s(:db)}) " \
+          "[#{payload[:method].to_s.upcase}]"
+
+        info "  Parameters: #{payload[:params].inspect}" unless payload[:params].blank?
+
+        additions = ActionController::Base.log_process_action(payload)
+
+        message = "Completed in %.0fms" % event.duration
+        message << " (#{additions.join(" | ")})" unless additions.blank?
+        message << " | #{payload[:status]} [#{payload[:request_uri]}]\n\n"
+
+        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