mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Added better error handling for regexp caching expiration
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1288 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
421045e2ff
commit
358a669390
3 changed files with 12 additions and 3 deletions
|
@ -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]
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue