aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-03 20:39:42 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-03 20:39:42 +0100
commit6fbe9ef2ffb1858027130789246f3ae24a0a182f (patch)
tree6926a804d3b78021e421470518bf10d2ca919ef9 /activesupport
parent4796be33a464a4587d0e22dfef113aca597c91c4 (diff)
downloadrails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.tar.gz
rails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.tar.bz2
rails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.zip
Use namespaces in notifications.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index ad238c1d96..25314ffd43 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -247,13 +247,13 @@ module ActiveSupport
expires_in || 0
end
- def instrument(operation, key, options, &block)
+ def instrument(operation, key, options)
log(operation, key, options)
if self.class.instrument
payload = { :key => key }
payload.merge!(options) if options.is_a?(Hash)
- ActiveSupport::Notifications.instrument(:"cache_#{operation}", payload, &block)
+ ActiveSupport::Notifications.instrument("activesupport.cache_#{operation}", payload){ yield }
else
yield
end