kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Added log "Rendering ...", when starting to render a template, to log that we have started to render something, at the very beginning.

Browse source 
This helps to easily identify queries from controller vs views

Fixes #23710
This commit is contained in:
Vipul A M 2016-02-16 23:26:33 +05:30 committed by Prem Sichanugrist
parent 364e155f97
commit c8915ec335
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionview/lib/action_view/log_subscriber.rb
View file

@ -30,6 +30,15 @@ module ActionView
end end
end end
def start_rendering(event)
info do
message = "Rendering #{from_rails_root(event.payload[:identifier])}"
message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
message
end
end
def logger def logger
ActionView::Base.logger ActionView::Base.logger
end end

1
actionview/lib/action_view/renderer/template_renderer.rb
View file

@ -50,6 +50,7 @@ module ActionView
view, locals = @view, locals || {} view, locals = @view, locals || {}
render_with_layout(layout_name, locals) do |layout| render_with_layout(layout_name, locals) do |layout|
ActiveSupport::Notifications.instrument("start_rendering.action_view", identifier: template.identifier, layout: layout.try(:virtual_path))
instrument(:template, :identifier => template.identifier, :layout => layout.try(:virtual_path)) do instrument(:template, :identifier => template.identifier, :layout => layout.try(:virtual_path)) do
template.render(view, locals) { |*name| view._layout_for(*name) } template.render(view, locals) { |*name| view._layout_for(*name) }
end end

9
actionview/test/template/log_subscriber_test.rb
View file

@ -35,7 +35,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
@view.render(:file => "test/hello_world") @view.render(:file => "test/hello_world")
wait wait
assert_equal 1, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_match(/Rendering test\/hello_world\.erb/, @logger.logged(:info).first)
assert_match(/Rendered test\/hello_world\.erb/, @logger.logged(:info).last) assert_match(/Rendered test\/hello_world\.erb/, @logger.logged(:info).last)
end end
end end
@ -45,7 +46,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
@view.render(:text => "TEXT") @view.render(:text => "TEXT")
wait wait
assert_equal 1, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_match(/Rendering text template/, @logger.logged(:info).first)
assert_match(/Rendered text template/, @logger.logged(:info).last) assert_match(/Rendered text template/, @logger.logged(:info).last)
end end
end end
@ -55,7 +57,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
@view.render(:inline => "<%= 'TEXT' %>") @view.render(:inline => "<%= 'TEXT' %>")
wait wait
assert_equal 1, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_match(/Rendering inline template/, @logger.logged(:info).first)
assert_match(/Rendered inline template/, @logger.logged(:info).last) assert_match(/Rendered inline template/, @logger.logged(:info).last)
end end
end end