aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/notifications
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-12 13:07:04 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-13 01:19:22 +0100
commit4704af763f47362135b644302b8666e36a58fb34 (patch)
tree9f045a9bc1974c6e73f2e5e11811d4e00c69b101 /activesupport/lib/active_support/notifications
parent1e12dc04cbd819f90eb6be5d3192784ee64cb811 (diff)
downloadrails-4704af763f47362135b644302b8666e36a58fb34.tar.gz
rails-4704af763f47362135b644302b8666e36a58fb34.tar.bz2
rails-4704af763f47362135b644302b8666e36a58fb34.zip
Do not send notifications when instrumentation raise an error.
Diffstat (limited to 'activesupport/lib/active_support/notifications')
-rw-r--r--activesupport/lib/active_support/notifications/instrumenter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index 3b0b0d8da2..af35eb92cb 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -13,9 +13,9 @@ module ActiveSupport
def instrument(name, payload={})
time = Time.now
- yield if block_given?
- ensure
+ result = yield if block_given?
@notifier.publish(name, time, Time.now, @id, payload)
+ result
end
private