diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-31 15:41:02 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-31 15:41:02 +0100 |
commit | cdda7defa0a37ff776ca961c8eeae347a46dd59b (patch) | |
tree | d1bc6fdef3906e243d235f63eb36ac965e0c2601 /actionpack | |
parent | a13d335461c6b177f0365ad07625c15f10ace271 (diff) | |
download | rails-cdda7defa0a37ff776ca961c8eeae347a46dd59b.tar.gz rails-cdda7defa0a37ff776ca961c8eeae347a46dd59b.tar.bz2 rails-cdda7defa0a37ff776ca961c8eeae347a46dd59b.zip |
Add lost log messages about template rendering
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_view/base.rb | 3 |
2 files changed, 3 insertions, 1 deletions
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 |