aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/log_subscriber.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionview/lib/action_view/log_subscriber.rb')
-rw-r--r--actionview/lib/action_view/log_subscriber.rb25
1 files changed, 21 insertions, 4 deletions
diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb
index 5a29c68214..c9f308c2a2 100644
--- a/actionview/lib/action_view/log_subscriber.rb
+++ b/actionview/lib/action_view/log_subscriber.rb
@@ -1,4 +1,4 @@
-require 'active_support/log_subscriber'
+require "active_support/log_subscriber"
module ActionView
# = Action View Log Subscriber
@@ -19,10 +19,19 @@ module ActionView
message << " (#{event.duration.round(1)}ms)"
end
end
- alias :render_partial :render_template
+
+ def render_partial(event)
+ 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)"
+ message << " #{cache_message(event.payload)}" if event.payload.key?(:cache_hit)
+ message
+ end
+ end
def render_collection(event)
- identifier = event.payload[:identifier] || 'templates'
+ identifier = event.payload[:identifier] || "templates"
info do
" Rendered collection of #{from_rails_root(identifier)}" \
@@ -44,7 +53,7 @@ module ActionView
protected
- EMPTY = ''
+ EMPTY = ""
def from_rails_root(string)
string = string.sub(rails_root, EMPTY)
string.sub!(VIEWS_PATTERN, EMPTY)
@@ -63,6 +72,14 @@ module ActionView
end
end
+ def cache_message(payload)
+ if payload[:cache_hit]
+ "[cache hit]"
+ else
+ "[cache miss]"
+ end
+ end
+
private
def log_rendering_start(payload)