mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 00:56:52 +00:00
3917353645
* Fix single Redis connection being used across all Sidekiq threads * Fix tests
15 lines
370 B
Ruby
15 lines
370 B
Ruby
# frozen_string_literal: true
|
|
|
|
class MergeWorker
|
|
include Sidekiq::Worker
|
|
include Redisable
|
|
|
|
def perform(from_account_id, into_account_id)
|
|
FeedManager.instance.merge_into_home(Account.find(from_account_id), Account.find(into_account_id))
|
|
rescue ActiveRecord::RecordNotFound
|
|
true
|
|
ensure
|
|
redis.del("account:#{into_account_id}:regeneration")
|
|
end
|
|
end
|