about summary refs log tree commit diff
path: root/app/workers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2021-05-04 04:45:08 +0200
committerGitHub <noreply@github.com>2021-05-04 04:45:08 +0200
commitfab65848d2eb8065ef3e49aaca4e4fb33f94f2b1 (patch)
tree1f6d597465d8f5e6e73aa7f3543339a36891eac3 /app/workers
parent8c44b723bb7505eb5923019b454ce9abd7ea59c0 (diff)
Fix empty home feed before first follow has finished processing (#16152)
Change queue of merge worker from pull to default
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/merge_worker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index 74ef7d4da..6ebb9a400 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -3,11 +3,11 @@
 class MergeWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'pull'
-
   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")
   end
 end