From b2c42d5521313dcac9622b07b17575383c030595 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 12 Aug 2013 17:33:18 +0100 Subject: [PATCH] Fix detection of timeouts --- 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 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 -- 2.43.2