aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-07-18 09:09:05 +0200
committerYves Senn <yves.senn@gmail.com>2014-07-18 09:09:05 +0200
commite44cb39663ad672c80aafa3615dd0d61148c2077 (patch)
tree51bf939c44a735fe9aad005f1f9c880a396bbc73 /actionview
parentd4c8068675f0b6be025590471b40ff175daa845e (diff)
parentee35b79d4cff24b960be54c3f5c4f46627c069fe (diff)
downloadrails-e44cb39663ad672c80aafa3615dd0d61148c2077.tar.gz
rails-e44cb39663ad672c80aafa3615dd0d61148c2077.tar.bz2
rails-e44cb39663ad672c80aafa3615dd0d61148c2077.zip
Merge pull request #16099 from tgxworld/pass_log_as_block
Prefer to pass block when logging.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/log_subscriber.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb
index 6c8d9cb5bf..9047dbdd85 100644
--- a/actionview/lib/action_view/log_subscriber.rb
+++ b/actionview/lib/action_view/log_subscriber.rb
@@ -13,11 +13,11 @@ module ActionView
end
def render_template(event)
- return unless logger.info?
- message = " Rendered #{from_rails_root(event.payload[:identifier])}"
- message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
- message << " (#{event.duration.round(1)}ms)"
- info(message)
+ info do
+ message = " Rendered #{from_rails_root(event.payload[:identifier])}"
+ message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
+ message << " (#{event.duration.round(1)}ms)"
+ end
end
alias :render_partial :render_template
alias :render_collection :render_template