cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Recognise wrapped timeout exceptions properly

Browse source
This commit is contained in:
Tom Hughes 2012-01-07 14:16:39 +00:00
parent 07ebb40ebb
commit 55dda7b184
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -299,7 +299,7 @@ class ApplicationController < ActionController::Base
OSM::Timer.timeout(WEB_TIMEOUT) do OSM::Timer.timeout(WEB_TIMEOUT) do
yield yield
end end
rescue ActionView::TemplateError => ex rescue ActionView::Template::Error => ex
if ex.original_exception.is_a?(Timeout::Error) if ex.original_exception.is_a?(Timeout::Error)
render :action => "timeout" render :action => "timeout"
else else