aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorStan Lo <a22301613@yahoo.com.tw>2015-12-31 09:41:48 +0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-23 21:06:40 -0300
commit1de6f7938dbc58a618a89397aad5f217a6221d17 (patch)
treec8a3cefd9748e778422e2509afd753516c8fd917 /actionmailer
parent3e824d3f5b32bae70832fe0c1c329ce062f79ff9 (diff)
downloadrails-1de6f7938dbc58a618a89397aad5f217a6221d17.tar.gz
rails-1de6f7938dbc58a618a89397aad5f217a6221d17.tar.bz2
rails-1de6f7938dbc58a618a89397aad5f217a6221d17.zip
Make caching configuration more flexible
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/caching.rb11
1 files changed, 7 insertions, 4 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