diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-09-21 12:05:28 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-09-21 12:05:28 -0700 |
| commit | 1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (patch) | |
| tree | 36201d3efb5af8ae5ec1898fd6f3b8b366227819 /actionpack/lib/action_view/template/template.rb | |
| parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
| parent | 4215e9ab936efca915ca998273d2fc0c46bb59b8 (diff) | |
| download | rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.gz rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.tar.bz2 rails-1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50.zip | |
Merge commit 'jose/orchestra'
Diffstat (limited to 'actionpack/lib/action_view/template/template.rb')
| -rw-r--r-- | actionpack/lib/action_view/template/template.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb index 7d6964e3e3..80c1bab7d5 100644 --- a/actionpack/lib/action_view/template/template.rb +++ b/actionpack/lib/action_view/template/template.rb @@ -27,8 +27,10 @@ module ActionView end def render(view, locals, &block) - method_name = compile(locals, view) - view.send(method_name, locals, &block) + ActiveSupport::Orchestra.instrument(:render_template, :identifier => identifier) do + method_name = compile(locals, view) + view.send(method_name, locals, &block) + end.result rescue Exception => e if e.is_a?(TemplateError) e.sub_template_of(self) |