diff options
| author | José Valim <jose.valim@gmail.com> | 2009-10-07 11:17:50 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-10-15 18:18:44 -0300 |
| commit | af0d1fa8920793a95fae456d1f5debdc50287eb3 (patch) | |
| tree | dfae586337161abfa8567bf085bdb2e68a070cc2 /activesupport/lib/active_support/orchestra.rb | |
| parent | 5d0f8abc003cc6edfdb471ada05754580725b353 (diff) | |
| download | rails-af0d1fa8920793a95fae456d1f5debdc50287eb3.tar.gz rails-af0d1fa8920793a95fae456d1f5debdc50287eb3.tar.bz2 rails-af0d1fa8920793a95fae456d1f5debdc50287eb3.zip | |
Update Orchestra instrumentations and move part of logging to Orchestra.
Diffstat (limited to 'activesupport/lib/active_support/orchestra.rb')
| -rw-r--r-- | activesupport/lib/active_support/orchestra.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/orchestra.rb b/activesupport/lib/active_support/orchestra.rb index 7c9c3074e3..7d4c25669d 100644 --- a/activesupport/lib/active_support/orchestra.rb +++ b/activesupport/lib/active_support/orchestra.rb @@ -66,7 +66,7 @@ module ActiveSupport def instrument(name, payload={}) payload[:time] = Time.now payload[:thread_id] = Thread.current.object_id - payload[:result] = yield + payload[:result] = yield if block_given? ensure payload[:duration] = 1000 * (Time.now.to_f - payload[:time].to_f) @publisher.publish(name, payload) @@ -147,7 +147,7 @@ module ActiveSupport end def publish(name, payload) - unless @pattern && name.to_s !~ @pattern + unless @pattern && !(@pattern === name.to_s) @queue << [name, payload] end end |