jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Post#fast_count: lower timeout to 1 second.

Browse Source
This commit is contained in:
evazion
2018-10-01 12:55:57 -05:00
parent ccb57e802c
commit 35eaf28822
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/post.rb
View File

@@ -1164,7 +1164,7 @@ class Post < ApplicationRecord
end end
module CountMethods module CountMethods
def fast_count(tags = "", options = {}) def fast_count(tags = "", timeout: 1_000, raise_on_timeout: false)
tags = tags.to_s tags = tags.to_s
tags += " rating:s" if CurrentUser.safe_mode? tags += " rating:s" if CurrentUser.safe_mode?
tags += " -status:deleted" if CurrentUser.hide_deleted_posts? && !Tag.has_metatag?(tags, "status", "-status") tags += " -status:deleted" if CurrentUser.hide_deleted_posts? && !Tag.has_metatag?(tags, "status", "-status")
@@ -1194,7 +1194,7 @@ class Post < ApplicationRecord
count = get_count_from_cache(tags) count = get_count_from_cache(tags)
if count.nil? if count.nil?
count = fast_count_search(tags, options) count = fast_count_search(tags, timeout: timeout, raise_on_timeout: raise_on_timeout)
end end
count count
@@ -1202,14 +1202,14 @@ class Post < ApplicationRecord
0 0
end end
def fast_count_search(tags, options = {}) def fast_count_search(tags, timeout:, raise_on_timeout:)
count = PostReadOnly.with_timeout(3_000, nil, {:tags => tags}) do count = PostReadOnly.with_timeout(timeout, nil, tags: tags) do
PostReadOnly.tag_match(tags).count PostReadOnly.tag_match(tags).count
end end
if count.nil? if count.nil?
# give up # give up
if options[:raise_on_timeout] if raise_on_timeout
raise TimeoutError.new("timed out") raise TimeoutError.new("timed out")
end end