From d446c798a5ef6c253c56d3b6a607073a8a92dcf2 Mon Sep 17 00:00:00 2001
From: James Cox <james@imaj.es>
Date: Fri, 24 Jun 2011 15:01:57 -0400
Subject: [PATCH] make the logs a little simpler to view, put the render
 message inline with other events, pull processing to char[0] and add a new
 line to the completed. looks more like a block now, which is useful for
 serial actions like test/dev

---
 actionpack/lib/action_controller/log_subscriber.rb | 9 +++++----
 actionpack/lib/action_view/log_subscriber.rb       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 8d813a8e38..35e29398e6 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -10,7 +10,7 @@ module ActionController
       format  = payload[:format]
       format  = format.to_s.upcase if format.is_a?(Symbol)
 
-      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
+      info "Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
       info "  Parameters: #{params.inspect}" unless params.empty?
     end
 
@@ -20,10 +20,11 @@ module ActionController
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?
-        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil 
-      end 
+        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil
+      end
       message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
+      message << "\n"
 
       info(message)
     end
@@ -59,4 +60,4 @@ module ActionController
   end
 end
 
-ActionController::LogSubscriber.attach_to :action_controller
\ No newline at end of file
+ActionController::LogSubscriber.attach_to :action_controller
diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb
index 29ffbd6fdd..bf90d012bf 100644
--- a/actionpack/lib/action_view/log_subscriber.rb
+++ b/actionpack/lib/action_view/log_subscriber.rb
@@ -4,7 +4,7 @@ module ActionView
   # 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 = "  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)