diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 11:32:45 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 16:04:10 -0300 |
| commit | c539c684aa0fc08769304746e1702aa1b4ddd4c8 (patch) | |
| tree | 67dcf16ed3e3d4028c5e2f8c8a9ab136582a95fd /activesupport/lib/active_support/cache/file_store.rb | |
| parent | c9642e31b1a9f764fbf1ce85b38fa225ec5e6b42 (diff) | |
| download | rails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.tar.gz rails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.tar.bz2 rails-c539c684aa0fc08769304746e1702aa1b4ddd4c8.zip | |
Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup
Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
activesupport/CHANGELOG.md
activesupport/test/caching_test.rb
Diffstat (limited to 'activesupport/lib/active_support/cache/file_store.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache/file_store.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index 9460532af0..c8003650e6 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -29,7 +29,8 @@ module ActiveSupport 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 |