optimize favorite delete, ignore statement timeout when expunging posts #2556

2015-12-07 14:39:46 -08:00
parent af22c2b7fa
commit ab325d48bf
2 changed files with 9 additions and 7 deletions
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1194,12 +1194,14 @@ class Post < ActiveRecord::Base

      ModAction.create(:description => "permanently deleted post ##{id}")
      delete!(:without_mod_action => true)
-      give_favorites_to_parent
-      update_children_on_destroy
-      decrement_tag_post_counts
-      remove_from_all_pools
-      destroy
-      update_parent_on_destroy
+      Post.without_timeout do
+        give_favorites_to_parent
+        update_children_on_destroy
+        decrement_tag_post_counts
+        remove_from_all_pools
+        destroy
+        update_parent_on_destroy
+      end
    end

    def ban!