From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 Jan 2012 14:16:39 +0000 (+0000)
Subject: Recognise wrapped timeout exceptions properly
X-Git-Tag: live~5870
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/55dda7b18497afde3ef379fc091761137f16c4c1

Recognise wrapped timeout exceptions properly
---

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