Merge pull request #23915 from sikachu/pr-23710-update

Revise #23717 (Add "Rendering ..." message) using proper ActiveSupport::LogSubscriber#start

1 files changed, 18 insertions, 0 deletions

diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb
index aa38db2a3a..5a29c68214 100644
--- a/actionview/lib/action_view/log_subscriber.rb
+++ b/actionview/lib/action_view/log_subscriber.rb
@@ -30,6 +30,14 @@ module ActionView
       end
     end
 
+    def start(name, id, payload)
+      if name == "render_template.action_view"
+        log_rendering_start(payload)
+      end
+
+      super
+    end
+
     def logger
       ActionView::Base.logger
     end
@@ -54,6 +62,16 @@ module ActionView
         "[#{payload[:count]} times]"
       end
     end
+
+  private
+
+    def log_rendering_start(payload)
+      info do
+        message = "  Rendering #{from_rails_root(payload[:identifier])}"
+        message << " within #{from_rails_root(payload[:layout])}" if payload[:layout]
+        message
+      end
+    end
   end
 end