diff --git a/app/logical/danbooru_maintenance.rb b/app/logical/danbooru_maintenance.rb index 4a6e62232..d3c3a7751 100644 --- a/app/logical/danbooru_maintenance.rb +++ b/app/logical/danbooru_maintenance.rb @@ -8,6 +8,7 @@ module DanbooruMaintenance end def daily + ActiveRecord::Base.connection.execute("set statement_timeout = 0") PostPruner.new.prune! Upload.prune! Delayed::Job.where('created_at < ?', 45.days.ago).delete_all @@ -22,9 +23,7 @@ module DanbooruMaintenance TagChangeRequestPruner.reject_all Ban.prune! - ApplicationRecord.without_timeout do - ActiveRecord::Base.connection.execute("vacuum analyze") unless Rails.env.test? - end + ActiveRecord::Base.connection.execute("vacuum analyze") unless Rails.env.test? rescue Exception => exception rescue_exception(exception) end diff --git a/app/logical/post_pruner.rb b/app/logical/post_pruner.rb index f80fdb401..bb9b3802f 100644 --- a/app/logical/post_pruner.rb +++ b/app/logical/post_pruner.rb @@ -1,10 +1,8 @@ class PostPruner def prune! - Post.without_timeout do - prune_pending! - prune_flagged! - prune_mod_actions! - end + prune_pending! + prune_flagged! + prune_mod_actions! end protected diff --git a/app/models/super_voter.rb b/app/models/super_voter.rb index 80f109c3c..1fa454936 100644 --- a/app/models/super_voter.rb +++ b/app/models/super_voter.rb @@ -13,13 +13,12 @@ class SuperVoter < ApplicationRecord def self.init! prune! - without_timeout do - report = PostVoteSimilarity.new(User.admins.first.id) - report.calculate_positive(15).each do |element| - unless SuperVoter.where("user_id = ?", element.user_id).exists? - SuperVoter.create(:user_id => element.user_id) - end + report = PostVoteSimilarity.new(User.admins.first.id) + + report.calculate_positive(15).each do |element| + unless SuperVoter.where("user_id = ?", element.user_id).exists? + SuperVoter.create(:user_id => element.user_id) end end end diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index d50b9da23..e750867f4 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -184,9 +184,7 @@ class TagAlias < TagRelationship end def self.update_cached_post_counts_for_all - TagAlias.without_timeout do - execute_sql("UPDATE tag_aliases SET post_count = tags.post_count FROM tags WHERE tags.name = tag_aliases.consequent_name") - end + execute_sql("UPDATE tag_aliases SET post_count = tags.post_count FROM tags WHERE tags.name = tag_aliases.consequent_name") end def create_mod_action