aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/caching.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 28618e2427..7749b07815 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -375,7 +375,13 @@ module ActionController #:nodoc:
def delete_matched(matcher, options) #:nodoc:
search_dir(@cache_path) do |f|
- File.delete(f) rescue nil if f =~ matcher
+ if f =~ matcher
+ begin
+ File.delete(f)
+ rescue Object => e
+ Base.logger.info "Couldn't expire cache: #{f} (#{e.message})" unless Base.logger.nil?
+ end
+ end
end
end