diff --git a/lib/log_overrider.rb b/lib/log_overrider.rb index 06e0b84d1..506506616 100644 --- a/lib/log_overrider.rb +++ b/lib/log_overrider.rb @@ -1,11 +1,15 @@ class ActionView::LogSubscriber def render_template(event) - message = "event=render " - message << "template=#{from_rails_root(event.payload[:identifier])} " - message << "layout=#{from_rails_root(event.payload[:layout])} " if event.payload[:layout] - message << "ms=#{("%.1f" % event.duration)} " - #message << "r_id=#{event.transaction_id} " - Rails.logger.info(message) + count = event.payload[:count] || 1 + hash = {:event => :render, + :template => from_rails_root(event.payload[:identifier]), + :total_ms => event.duration, + :count => count, + :ms => event.duration / count} + + hash.merge(:layout => event.payload[:layout]) if event.payload[:layout] + + Rails.logger.info(hash) end alias :render_partial :render_template alias :render_collection :render_template diff --git a/spec/shared_behaviors/log_override.rb b/spec/shared_behaviors/log_override.rb index 6c8b893d5..96cdd3c09 100644 --- a/spec/shared_behaviors/log_override.rb +++ b/spec/shared_behaviors/log_override.rb @@ -57,7 +57,7 @@ shared_examples_for 'it overrides the logs on success' do @line.include?("params='#{@action_params.inspect.gsub(" ", "")}'").should be_true end end - it 'does not log the view rendering time addition' do + it 'logs the view rendering time addition' do @line.include?("view_ms=").should be_true end end