projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
07ebb40
)
Recognise wrapped timeout exceptions properly
author
Tom Hughes
<tom@compton.nu>
Sat, 7 Jan 2012 14:16:39 +0000
(14:16 +0000)
committer
Tom Hughes
<tom@compton.nu>
Sat, 7 Jan 2012 14:16:39 +0000
(14:16 +0000)
app/controllers/application_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/application_controller.rb
b/app/controllers/application_controller.rb
index e64e2e022fca6b92ef8d5f464206195e8d405e2c..74576555134e26a77040c95781fdfbac7158bc2c 100644
(file)
--- a/
app/controllers/application_controller.rb
+++ b/
app/controllers/application_controller.rb
@@
-299,7
+299,7
@@
class ApplicationController < ActionController::Base
OSM::Timer.timeout(WEB_TIMEOUT) do
yield
end
- rescue ActionView::TemplateError => ex
+ rescue ActionView::Template
::
Error => ex
if ex.original_exception.is_a?(Timeout::Error)
render :action => "timeout"
else