diff options
| author | Oliver Jakubiec <ojakubiec@gmail.com> | 2013-04-02 18:45:28 -0700 |
|---|---|---|
| committer | Oliver Jakubiec <ojakubiec@gmail.com> | 2013-04-02 18:45:28 -0700 |
| commit | b13789c30cc991e2c0b20f16705a88e45c91dcad (patch) | |
| tree | a7dd94d14b8d62c4c48fb89d9a089eeac079a9b1 /activesupport/lib/active_support/notifications/instrumenter.rb | |
| parent | 8917a5b949856f8ef44d03d98470614c8cf8bbee (diff) | |
| parent | 919c86d2d5e7b74b96305c0bfb0482bbe61d99f2 (diff) | |
| download | rails-b13789c30cc991e2c0b20f16705a88e45c91dcad.tar.gz rails-b13789c30cc991e2c0b20f16705a88e45c91dcad.tar.bz2 rails-b13789c30cc991e2c0b20f16705a88e45c91dcad.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/notifications/instrumenter.rb')
| -rw-r--r-- | activesupport/lib/active_support/notifications/instrumenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb index 4f1cb85cc2..0c9a729ce5 100644 --- a/activesupport/lib/active_support/notifications/instrumenter.rb +++ b/activesupport/lib/active_support/notifications/instrumenter.rb @@ -17,7 +17,7 @@ module ActiveSupport def instrument(name, payload={}) start name, payload begin - yield + yield payload rescue Exception => e payload[:exception] = [e.class.name, e.message] raise e |