aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-05-30 07:05:52 +0000
committerJamis Buck <jamis@37signals.com>2005-05-30 07:05:52 +0000
commitb6c13f2d70eaa02f264281f34b518b4e9a6d41c6 (patch)
treebe726bebbf1d7548ace1b7051119d76e45a4768f /actionpack/lib/action_controller/caching.rb
parent359caef33ca71b37b3ea2feef0960beccfabf4de (diff)
downloadrails-b6c13f2d70eaa02f264281f34b518b4e9a6d41c6.tar.gz
rails-b6c13f2d70eaa02f264281f34b518b4e9a6d41c6.tar.bz2
rails-b6c13f2d70eaa02f264281f34b518b4e9a6d41c6.zip
Don't die when an attempt to delete a cache fails
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 55a4b77fda..53ec03a7a4 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -375,7 +375,9 @@ module ActionController #:nodoc:
end
def delete(name, options) #:nodoc:
- File.delete(real_file_path(name)) if File.exist?(real_file_path(name))
+ File.delete(real_file_path(name))
+ rescue SystemCallError => e
+ Base.logger.info "Couldn't expire cache #{name} (#{e.message})" unless Base.logger.nil?
end
def delete_matched(matcher, options) #:nodoc: