diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-03 20:39:42 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-03 20:39:42 +0100 |
commit | 6fbe9ef2ffb1858027130789246f3ae24a0a182f (patch) | |
tree | 6926a804d3b78021e421470518bf10d2ca919ef9 /actionpack/lib/action_controller/caching/fragments.rb | |
parent | 4796be33a464a4587d0e22dfef113aca597c91c4 (diff) | |
download | rails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.tar.gz rails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.tar.bz2 rails-6fbe9ef2ffb1858027130789246f3ae24a0a182f.zip |
Use namespaces in notifications.
Diffstat (limited to 'actionpack/lib/action_controller/caching/fragments.rb')
-rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb index f569d0dd8b..91f781a44d 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_controller/caching/fragments.rb @@ -53,7 +53,7 @@ module ActionController #:nodoc: return content unless cache_configured? key = fragment_cache_key(key) - ActiveSupport::Notifications.instrument(:write_fragment, :key => key) do + instrument_fragment_cache :write_fragment, key do cache_store.write(key, content, options) end content @@ -64,7 +64,7 @@ module ActionController #:nodoc: return unless cache_configured? key = fragment_cache_key(key) - ActiveSupport::Notifications.instrument(:read_fragment, :key => key) do + instrument_fragment_cache :read_fragment, key do cache_store.read(key, options) end end @@ -74,7 +74,7 @@ module ActionController #:nodoc: return unless cache_configured? key = fragment_cache_key(key) - ActiveSupport::Notifications.instrument(:exist_fragment?, :key => key) do + instrument_fragment_cache :exist_fragment?, key do cache_store.exist?(key, options) end end @@ -101,16 +101,18 @@ module ActionController #:nodoc: key = fragment_cache_key(key) unless key.is_a?(Regexp) message = nil - ActiveSupport::Notifications.instrument(:expire_fragment, :key => key) do + instrument_fragment_cache :expire_fragment, key do if key.is_a?(Regexp) - message = "Expired fragments matching: #{key.source}" cache_store.delete_matched(key, options) else - message = "Expired fragment: #{key}" cache_store.delete(key, options) end end end + + def instrument_fragment_cache(name, key) + ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :key => key){ yield } + end end end end |