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

fix timeout

Browse Source
This commit is contained in:
albert
2013-04-01 00:06:58 -04:00
parent 88a900ac9e
commit 9a70d8c353
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/active_record_extensions.rb
View File

@@ -8,7 +8,7 @@ module Danbooru
connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test" connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test"
yield yield
ensure ensure
connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.statement_timeout}") unless Rails.env == "test" connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
end end
def with_timeout(n, default_value = nil) def with_timeout(n, default_value = nil)
@@ -17,7 +17,7 @@ module Danbooru
rescue ::ActiveRecord::StatementInvalid rescue ::ActiveRecord::StatementInvalid
return default_value return default_value
ensure ensure
connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.statement_timeout}") unless Rails.env == "test" connection.execute("SET STATEMENT_TIMEOUT = #{CurrentUser.user.try(:statement_timeout) || 3_000}") unless Rails.env == "test"
end end
end end