Merge remote branch 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

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..5797eeebd6 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("action_controller.#{name}", :path => path){ yield }
+          end
       end
 
       # Expires the page that was cached with the +options+ as a key. Example: