Make caching configuration more flexible

3 files changed, 21 insertions, 11 deletions

diff --git a/actionmailer/lib/action_mailer/caching.rb b/actionmailer/lib/action_mailer/caching.rb
index 319909d1a7..8e659981a1 100644
--- a/actionmailer/lib/action_mailer/caching.rb
+++ b/actionmailer/lib/action_mailer/caching.rb
@@ -8,12 +8,15 @@ module ActionMailer
       include ActionDispatch::Caching
     end
 
-    def perform_caching
-      Base.perform_caching
+    def instrument_payload(key)
+      {
+        mailer: mailer_name,
+        key: key
+      }
     end
 
-    def controller_name
-      "ActionMailer"
+    def instrument_name
+      "action_mailer"
     end
   end
 end
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index e832f4adf4..999c2636da 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -29,5 +29,17 @@ module ActionController
     included do
       include ActionDispatch::Caching
     end
+
+    def instrument_payload(key)
+      {
+        controller: controller_name,
+        action: action_name,
+        key: key
+      }
+    end
+
+    def instrument_name
+      "action_controller"
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/caching/fragments.rb b/actionpack/lib/action_dispatch/caching/fragments.rb
index c410aaf03a..dcc490776e 100644
--- a/actionpack/lib/action_dispatch/caching/fragments.rb
+++ b/actionpack/lib/action_dispatch/caching/fragments.rb
@@ -135,13 +135,8 @@ module ActionDispatch
       end
 
       def instrument_fragment_cache(name, key) # :nodoc:
-        payload = {
-          controller: controller_name,
-          action: action_name,
-          key: key
-        }
-
-        ActiveSupport::Notifications.instrument("#{name}.action_controller", payload) { yield }
+        payload = instrument_payload(key)
+        ActiveSupport::Notifications.instrument("#{name}.#{instrument_name}", payload) { yield }
       end
     end
   end