From accd4926cc072217bc98b82368d20fb8f79a8bca Mon Sep 17 00:00:00 2001 From: Murray Steele Date: Wed, 11 Sep 2013 13:24:50 +0100 Subject: Fix FileStore#cleanup to no longer rely on missing each_key method --- activesupport/lib/active_support/cache/file_store.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/cache/file_store.rb') diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index 472f23c1c5..10d39463ec 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -33,7 +33,8 @@ module ActiveSupport # Premptively iterates through all stored keys and removes the ones which have expired. def cleanup(options = nil) options = merged_options(options) - each_key(options) do |key| + search_dir(cache_path) do |fname| + key = file_path_key(fname) entry = read_entry(key, options) delete_entry(key, options) if entry && entry.expired? end -- cgit v1.2.3