From 2a83f2d0caefd3c9221ad57492040b85f0d49518 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 6 Jan 2013 13:25:08 -0500 Subject: [PATCH] trap on statement timeouts when counting posts --- lib/danbooru/paginator/active_record_extension.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb index 327ef118d..6101a934c 100644 --- a/lib/danbooru/paginator/active_record_extension.rb +++ b/lib/danbooru/paginator/active_record_extension.rb @@ -73,6 +73,12 @@ module Danbooru c = c.reorder(nil) c = c.count c.respond_to?(:count) ? c.count : c + rescue ActiveRecord::StatementInvalid => e + if e.to_s =~ /statement timeout/ + 1_000_000 + else + raise + end end end end