From 9a70d8c353d637d6e88fce62f770ccf4fcac2d56 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 1 Apr 2013 00:06:58 -0400 Subject: [PATCH] fix timeout --- config/initializers/active_record_extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/active_record_extensions.rb b/config/initializers/active_record_extensions.rb index d512e19d1..4a9b12a58 100644 --- a/config/initializers/active_record_extensions.rb +++ b/config/initializers/active_record_extensions.rb @@ -8,7 +8,7 @@ module Danbooru connection.execute("SET STATEMENT_TIMEOUT = 0") unless Rails.env == "test" yield 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 def with_timeout(n, default_value = nil) @@ -17,7 +17,7 @@ module Danbooru rescue ::ActiveRecord::StatementInvalid return default_value 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