diff options
| author | Andrew White <andrew.white@unboxed.co> | 2017-03-15 14:53:25 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2017-03-15 14:56:27 +0000 |
| commit | de5eb9ed9869fad99af0296267594e5ae6dff74b (patch) | |
| tree | 8f2017dba74e517026fafc8c148191ccc13aa80c /activesupport | |
| parent | c7135d2c8ebf2263ebb82dfe1723c7435676e11f (diff) | |
| download | rails-de5eb9ed9869fad99af0296267594e5ae6dff74b.tar.gz rails-de5eb9ed9869fad99af0296267594e5ae6dff74b.tar.bz2 rails-de5eb9ed9869fad99af0296267594e5ae6dff74b.zip | |
Restore 5.minutes changed in #28204
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index 5eee04a34e..e09cee3335 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -156,7 +156,7 @@ module ActiveSupport expires_in = options[:expires_in].to_i if expires_in > 0 && !options[:raw] # Set the memcache expire a few minutes in the future to support race condition ttls on read - expires_in += 300 + expires_in += 5.minutes end rescue_error_with false do @data.send(method, key, value, expires_in, options) |