From c6d4500c91a771ef7a74d1716b4735103395dc91 Mon Sep 17 00:00:00 2001 From: albert Date: Thu, 24 Jan 2013 18:09:22 -0500 Subject: [PATCH] restrict count timeout to 500 ms --- app/models/post.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/post.rb b/app/models/post.rb index 1cc40926a..31a4daa89 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -601,9 +601,12 @@ class Post < ActiveRecord::Base count = Danbooru.config.blank_tag_search_fast_count else begin + ActiveRecord::Base.connection.execute("SET statement_timeout = 500") count = Post.tag_match(tags).undeleted.count rescue ActiveRecord::StatementInvalid count = Danbooru.config.blank_tag_search_fast_count || 1_000_000 + ensure + ActiveRecord::Base.connection.execute("SET statement_timeout = 3000") end end