github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 04:33:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: Perform topics merge in a background thread (#28114)

Browse Source 
Similar to https://github.com/discourse/discourse/pull/28061, merging topics with many posts can exceed the 30 seconds timeout that Unicorn workers are limited to, so we should move the operation into a background thread to get around this limit.

Internal topic: t/133710.
This commit is contained in:
Osama Sayegh 2024-07-30 13:54:17 +03:00 committed by GitHub
parent 647294ad7b
commit 731fcad3d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/topics_controller.rb
View File

@ -855,8 +855,11 @@ class TopicsController < ApplicationController
params[:archetype] == "private_message"
end
destination_topic = topic.move_posts(current_user, topic.posts.pluck(:id), args)
render_topic_changes(destination_topic)
acting_user = current_user
hijack(info: "merging topic #{topic_id.inspect} into #{destination_topic_id.inspect}") do
destination_topic = topic.move_posts(acting_user, topic.posts.pluck(:id), args)
render_topic_changes(destination_topic)
end
end
def move_posts