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 /actionpack/lib/action_controller/caching/pages.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 'actionpack/lib/action_controller/caching/pages.rb')
-rw-r--r-- | actionpack/lib/action_controller/caching/pages.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index 4fb154470f..72551d1fd6 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -64,12 +64,9 @@ module ActionController #:nodoc: return unless perform_caching path = page_cache_path(path) - event = ActiveSupport::Orchestra.instrument(:expire_page, :path => path) do + ActiveSupport::Orchestra.instrument(:expire_page, :path => path) do File.delete(path) if File.exist?(path) end - - log_with_time("Expired page: #{path}", event.duration) - event.result end # Manually cache the +content+ in the key determined by +path+. Example: @@ -78,13 +75,10 @@ module ActionController #:nodoc: return unless perform_caching path = page_cache_path(path) - event = ActiveSupport::Orchestra.instrument(:cache_page, :path => path) do + ActiveSupport::Orchestra.instrument(:cache_page, :path => path) do FileUtils.makedirs(File.dirname(path)) File.open(path, "wb+") { |f| f.write(content) } end - - log_with_time("Cached page: #{path}", event.duration) - event.result end # Caches the +actions+ using the page-caching approach that'll store the cache in a path within the page_cache_directory that |