Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add lost log messages about template rendering

  • Loading branch information...
commit cdda7defa0a37ff776ca961c8eeae347a46dd59b 1 parent a13d335
@lifo lifo authored
View
1  actionpack/lib/action_controller/base.rb
@@ -1122,7 +1122,6 @@ def reset_session #:doc:
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
View
3  actionpack/lib/action_view/base.rb
@@ -253,6 +253,7 @@ def render(options = {}, local_assigns = {}, &block) #: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 @@ def set_controller_content_type(content_type)
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
Please sign in to comment.
Something went wrong with that request. Please try again.