mastodon/app/workers/merge_worker.rb

# frozen_string_literal: true

class MergeWorker
  include Sidekiq::Worker

  sidekiq_options queue: 'pull'

  def perform(from_account_id, into_account_id)
    FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id))
  end
end
Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive 2017-01-23 20:29:34 +00:00			`# frozen_string_literal: true`

			`class MergeWorker`
			`include Sidekiq::Worker`

Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file The pull queue will handle link crawling, thread resolving, and OStatus processing. Such tasks are more likely to hang for a longer time (due to network requests) so it is more sensible to not make the "in-house" tasks wait for them. 2017-04-03 22:53:20 +00:00			`sidekiq_options queue: 'pull'`

Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive 2017-01-23 20:29:34 +00:00			`def perform(from_account_id, into_account_id)`
			`FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id))`
			`end`
			`end`