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/pages.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/pages.rb')
-rw-r--r-- | actionpack/lib/action_controller/caching/pages.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index d46f528c7e..4498abcdbe 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -64,7 +64,7 @@ module ActionController #:nodoc: return unless perform_caching path = page_cache_path(path) - ActiveSupport::Notifications.instrument(:expire_page, :path => path) do + instrument_page_cache :expire_page, path do File.delete(path) if File.exist?(path) end end @@ -75,7 +75,7 @@ module ActionController #:nodoc: return unless perform_caching path = page_cache_path(path) - ActiveSupport::Notifications.instrument(:cache_page, :path => path) do + instrument_page_cache :write_page, path do FileUtils.makedirs(File.dirname(path)) File.open(path, "wb+") { |f| f.write(content) } end @@ -107,6 +107,10 @@ module ActionController #:nodoc: def page_cache_path(path) page_cache_directory + page_cache_file(path) end + + def instrument_page_cache(name, path) + ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :path => path){ yield } + end end # Expires the page that was cached with the +options+ as a key. Example: |