aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-03-19 13:48:27 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2013-03-19 13:48:27 -0700
commit67a2c731c322c290d7ed44726a33d50489d1ed95 (patch)
tree7d034b16d231b42744a1aacabd2656f008529483 /activesupport
parenta6c5ee3032c50720760f7a4c895206b4205836c0 (diff)
parentca9fc5aea7c78871381149b7650fc16a86e8153c (diff)
downloadrails-67a2c731c322c290d7ed44726a33d50489d1ed95.tar.gz
rails-67a2c731c322c290d7ed44726a33d50489d1ed95.tar.bz2
rails-67a2c731c322c290d7ed44726a33d50489d1ed95.zip
Merge pull request #9807 from vipulnsward/remove_unused_payloads
remove unused payloads in blocks in caching instrumentation
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index edbe697962..6bfac15289 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -344,7 +344,7 @@ module ActiveSupport
# Options are passed to the underlying cache implementation.
def write(name, value, options = nil)
options = merged_options(options)
- instrument(:write, name, options) do |payload|
+ instrument(:write, name, options) do
entry = Entry.new(value, options)
write_entry(namespaced_key(name, options), entry, options)
end
@@ -355,7 +355,7 @@ module ActiveSupport
# Options are passed to the underlying cache implementation.
def delete(name, options = nil)
options = merged_options(options)
- instrument(:delete, name) do |payload|
+ instrument(:delete, name) do
delete_entry(namespaced_key(name, options), options)
end
end
@@ -365,7 +365,7 @@ module ActiveSupport
# Options are passed to the underlying cache implementation.
def exist?(name, options = nil)
options = merged_options(options)
- instrument(:exist?, name) do |payload|
+ instrument(:exist?, name) do
entry = read_entry(namespaced_key(name, options), options)
entry && !entry.expired?
end