From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Aug 2013 16:33:18 +0000 (+0100)
Subject: Fix detection of timeouts
X-Git-Tag: live~4837
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b2c42d5521313dcac9622b07b17575383c030595

Fix detection of timeouts
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5ee483ed4..0cd850cc6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -370,7 +370,7 @@ class ApplicationController < ActionController::Base
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 
-    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/
+    if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/
       ex = Timeout::Error.new
     end