From 4704af763f47362135b644302b8666e36a58fb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 12 Jan 2010 13:07:04 +0100 Subject: Do not send notifications when instrumentation raise an error. --- .../lib/active_support/notifications/instrumenter.rb | 4 ++-- activesupport/test/notifications_test.rb | 11 ++++------- 2 files changed, 6 insertions(+), 9 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 diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb index 62849c3d04..226e12ff75 100644 --- a/activesupport/test/notifications_test.rb +++ b/activesupport/test/notifications_test.rb @@ -113,20 +113,17 @@ module Notifications assert_equal Hash[:payload => "notifications"], @events.last.payload end - def test_instrument_publishes_when_exception_is_raised + def test_instrument_does_not_publish_when_exception_is_raised begin instrument(:awesome, :payload => "notifications") do raise "OMG" end - flunk - rescue + rescue RuntimeError => e + assert_equal "OMG", e.message end drain - - assert_equal 1, @events.size - assert_equal :awesome, @events.last.name - assert_equal Hash[:payload => "notifications"], @events.last.payload + assert_equal 0, @events.size end def test_event_is_pushed_even_without_block -- cgit v1.2.3