Skip to content
Browse files

Added better error handling for regexp caching expiration

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1288 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 421045e commit 358a6693909009556f493f0c29e344af4acc3275 @dhh dhh committed May 6, 2005
Showing with 12 additions and 3 deletions.
  1. +5 −1 actionpack/CHANGELOG
  2. +7 −1 actionpack/lib/action_controller/caching.rb
  3. +0 −1 railties/CHANGELOG
View
6 actionpack/CHANGELOG
@@ -1,10 +1,14 @@
*SVN*
+* Added better error handling for regexp caching expiration
+
+* Fixed handling of requests coming from unknown HTTP methods not to kill the server
+
* Added that both AssetHelper#stylesheet_link_tag and AssetHelper#javascript_include_tag now accept an option hash as the last parameter, so you can do stuff like: stylesheet_link_tag "style", :media => "all"
* Added FormTagHelper#image_submit_tag for making submit buttons that uses images
-* Added the option of specifying a RAILS_ASSET_HOST that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that.
+* Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that.
* Fixed action/fragment caching using the filestore when a directory and a file wanted to to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com]
View
8 actionpack/lib/action_controller/caching.rb
@@ -375,7 +375,13 @@ def delete(name, options) #: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
View
1 railties/CHANGELOG
@@ -1,6 +1,5 @@
*SVN*
-
* Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]
* Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck]

0 comments on commit 358a669

Please sign in to comment.
Something went wrong with that request. Please try again.