diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-04-28 18:16:42 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-28 18:16:42 +0200 |
commit | f23f784f1811a5e7ae82faaf8868e389e9608f5d (patch) | |
tree | 77b919683a8656a361d7d62c8745233bc8b2d310 /app/workers/merge_worker.rb | |
parent | 6a9d1549484a6fb02d7d01e884577a7185302046 (diff) | |
parent | 8284110c55679b7ce7b3922cb0559620b03ca88c (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/workers/merge_worker.rb')
-rw-r--r-- | app/workers/merge_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index 6ebb9a400..e526d2887 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -2,12 +2,13 @@ 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.current.del("account:#{into_account_id}:regeneration") + redis.del("account:#{into_account_id}:regeneration") end end |