aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorErich Soares Machado <erichmachado@gmail.com>2017-10-03 00:49:13 +0200
committerErich Soares Machado <erichmachado@gmail.com>2017-10-03 09:51:35 +0200
commite2dbfe5adac3438e3f8bbd2e2dce2ad39c91221b (patch)
treef17f1f1e20bcdcf14b756cd657ceed84023e314e /activesupport
parent012196bbc78cf1c9243d0c2ceaa1e509a9a34a11 (diff)
downloadrails-e2dbfe5adac3438e3f8bbd2e2dce2ad39c91221b.tar.gz
rails-e2dbfe5adac3438e3f8bbd2e2dce2ad39c91221b.tar.bz2
rails-e2dbfe5adac3438e3f8bbd2e2dce2ad39c91221b.zip
Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from cleaning up the expired cache keys
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/cache/file_store.rb5
-rw-r--r--activesupport/test/cache/stores/file_store_test.rb1
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 28df2c066e..f98d343ccd 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -39,9 +39,8 @@ module ActiveSupport
def cleanup(options = nil)
options = merged_options(options)
search_dir(cache_path) do |fname|
- key = file_path_key(fname)
- entry = read_entry(key, options)
- delete_entry(key, options) if entry && entry.expired?
+ entry = read_entry(fname, options)
+ delete_entry(fname, options) if entry && entry.expired?
end
end
diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb
index 391ab60b3a..66231b0a82 100644
--- a/activesupport/test/cache/stores/file_store_test.rb
+++ b/activesupport/test/cache/stores/file_store_test.rb
@@ -118,6 +118,7 @@ class FileStoreTest < ActiveSupport::TestCase
assert_not @cache.exist?("foo")
assert @cache.exist?("baz")
assert @cache.exist?("quux")
+ assert_equal 2, Dir.glob(File.join(cache_dir, "**")).size
end
end