diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-31 16:29:21 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-31 16:29:21 +0100 |
| commit | 56c2b02f592aa7c127346f2c68ac45236c27702e (patch) | |
| tree | a9eadea109c36c29be817e906f8808b1f61356d7 /actionpack/lib/action_controller | |
| parent | cdda7defa0a37ff776ca961c8eeae347a46dd59b (diff) | |
| download | rails-56c2b02f592aa7c127346f2c68ac45236c27702e.tar.gz rails-56c2b02f592aa7c127346f2c68ac45236c27702e.tar.bz2 rails-56c2b02f592aa7c127346f2c68ac45236c27702e.zip | |
Fix AM tests and add tests for rendering logging
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1f3ffe2933..f527b131d8 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -871,6 +871,7 @@ module ActionController #:nodoc: end response.layout = layout = pick_layout(options) + logger.info("Rendering template within #{layout}") if logger && layout if content_type = options[:content_type] response.content_type = content_type.to_s @@ -1122,6 +1123,7 @@ 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 |