Update Orchestra instrumentations and move part of logging to Orchestra.

3 files changed, 15 insertions, 27 deletions

diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 59e24619e3..00fb55f843 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -51,40 +51,32 @@ module ActionController #:nodoc:
       # Writes <tt>content</tt> to the location signified by <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats)
       def write_fragment(key, content, options = nil)
         return content unless cache_configured?
-
         key = fragment_cache_key(key)
-        event = ActiveSupport::Orchestra.instrument(:write_fragment, :key => key) do
+
+        ActiveSupport::Orchestra.instrument(:write_fragment, :key => key) do
           cache_store.write(key, content, options)
         end
-
-        self.class.log_with_time("Cached fragment miss: #{key}", event.duration)
         content
       end
 
       # Reads a cached fragment from the location signified by <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats)
       def read_fragment(key, options = nil)
         return unless cache_configured?
-
         key = fragment_cache_key(key)
-        event = ActiveSupport::Orchestra.instrument(:read_fragment, :key => key) do
+
+        ActiveSupport::Orchestra.instrument(:read_fragment, :key => key) do
           cache_store.read(key, options)
         end
-
-        self.class.log_with_time("Cached fragment hit: #{key}", event.duration)
-        event.result
       end
 
       # Check if a cached fragment from the location signified by <tt>key</tt> exists (see <tt>expire_fragment</tt> for acceptable formats)
       def fragment_exist?(key, options = nil)
         return unless cache_configured?
-
         key = fragment_cache_key(key)
-        event = ActiveSupport::Orchestra.instrument(:fragment_exist?, :key => key) do
+
+        ActiveSupport::Orchestra.instrument(:fragment_exist?, :key => key) do
           cache_store.exist?(key, options)
         end
-
-        self.class.log_with_time("Cached fragment exists?: #{key}", event.duration)
-        event.result
       end
 
       # Removes fragments from the cache.
@@ -106,11 +98,10 @@ module ActionController #:nodoc:
       # method (or <tt>delete_matched</tt>, for Regexp keys.)
       def expire_fragment(key, options = nil)
         return unless cache_configured?
-
         key = fragment_cache_key(key) unless key.is_a?(Regexp)
         message = nil
 
-        event = ActiveSupport::Orchestra.instrument(:expire_fragment, :key => key) do
+        ActiveSupport::Orchestra.instrument(:expire_fragment, :key => key) do
           if key.is_a?(Regexp)
             message = "Expired fragments matching: #{key.source}"
             cache_store.delete_matched(key, options)
@@ -119,9 +110,6 @@ module ActionController #:nodoc:
             cache_store.delete(key, options)
           end
         end
-
-        self.class.log_with_time(message, event.duration)
-        event.result
       end
     end
   end
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
diff --git a/actionpack/lib/action_controller/instrument.rb b/actionpack/lib/action_controller/instrument.rb
new file mode 100644
index 0000000000..00888c425f
--- /dev/null
+++ b/actionpack/lib/action_controller/instrument.rb
@@ -0,0 +1,6 @@
+require 'active_support/orchestra'
+
+ActiveSupport::Orchestra.subscribe(/(read|write|cache|expire|exist)_(fragment|page)\??/) do |event|
+  human_name = event.name.to_s.humanize
+  ActionController::Base.log("#{human_name} (%.1fms)" % event.duration)
+end