From cdda7defa0a37ff776ca961c8eeae347a46dd59b Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sun, 31 Aug 2008 15:41:02 +0100 Subject: Add lost log messages about template rendering --- actionpack/lib/action_controller/base.rb | 1 - actionpack/lib/action_view/base.rb | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 87361788d1..1f3ffe2933 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1122,7 +1122,6 @@ module ActionController #:nodoc: private def render_for_file(template_path, status = nil, layout = nil, locals = {}) #:nodoc: - logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger render_for_text @template.render(:file => template_path, :locals => locals, :layout => layout), status end diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index f1c6f4a7a0..9a2b667005 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -253,6 +253,7 @@ module ActionView #:nodoc: ActiveSupport::Deprecation.warn("use_full_path option has been deprecated and has no affect.", caller) end + logger.info("Rendering #{options[:file]}") if logger pick_template(options[:file]).render_template(self, options[:locals]) elsif options[:partial] render_partial(options) @@ -352,6 +353,8 @@ module ActionView #:nodoc: def render_with_layout(options, local_assigns, &block) partial_layout = options.delete(:layout) + logger.info("Rendering template within #{partial_layout}") if logger + if block_given? begin @_proc_for_layout = block -- cgit v1.2.3