aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/strategy
diff options
context:
space:
mode:
authorMichael Grosser <michael@grosser.it>2015-11-05 17:43:22 -0800
committerMichael Grosser <michael@grosser.it>2015-11-05 17:47:40 -0800
commitb9fb0f262371a668865d0987585933add7085670 (patch)
tree3ab95fc61d6377ae3f80969de7be3c2a2ce6c16c /activesupport/lib/active_support/cache/strategy
parent07b2ff03d04656faccc68c83541b06e318a36ed7 (diff)
downloadrails-b9fb0f262371a668865d0987585933add7085670.tar.gz
rails-b9fb0f262371a668865d0987585933add7085670.tar.bz2
rails-b9fb0f262371a668865d0987585933add7085670.zip
cache nil replies from backend cache so misses are fast too
Diffstat (limited to 'activesupport/lib/active_support/cache/strategy')
-rw-r--r--activesupport/lib/active_support/cache/strategy/local_cache.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index fe5bc82c30..e1da2be2d4 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -48,6 +48,10 @@ module ActiveSupport
@data.clear
end
+ def fetch(*args, &block)
+ @data.fetch(*args, &block)
+ end
+
def read_entry(key, options)
@data[key]
end
@@ -99,12 +103,11 @@ module ActiveSupport
protected
def read_entry(key, options) # :nodoc:
if local_cache
- entry = local_cache.read_entry(key, options)
- unless entry
+ local_cache.fetch(key) do
entry = super
local_cache.write_entry(key, entry, options)
+ entry
end
- entry
else
super
end