From 55dda7b18497afde3ef379fc091761137f16c4c1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 7 Jan 2012 14:16:39 +0000 Subject: [PATCH] Recognise wrapped timeout exceptions properly --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e64e2e022..745765551 100644 --- 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 -- 2.39.5