diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-03-31 21:59:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 21:59:03 +0200 |
| commit | 9014367bd87e07941134259d87f4d2c327ff37d4 (patch) | |
| tree | cb1ae1a1ccc716951e6bfaf9280e6324c288c4b7 /app/workers/activitypub | |
| parent | 1fb92037e432913902a5e5c8a5b673b036d84cb8 (diff) | |
Fix background jobs not using locks like they are supposed to (#13361)
Also: - Fix locks not being removed when jobs go to the dead job queue - Add UI for managing locks to the Sidekiq dashboard - Remove unused Sidekiq workers Fix #13349
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/distribute_poll_update_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/activitypub/synchronize_featured_collection_worker.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/activitypub/distribute_poll_update_worker.rb b/app/workers/activitypub/distribute_poll_update_worker.rb index 1e87fa4bf..25dee4ee2 100644 --- a/app/workers/activitypub/distribute_poll_update_worker.rb +++ b/app/workers/activitypub/distribute_poll_update_worker.rb @@ -4,7 +4,7 @@ class ActivityPub::DistributePollUpdateWorker include Sidekiq::Worker include Payloadable - sidekiq_options queue: 'push', unique: :until_executed, retry: 0 + sidekiq_options queue: 'push', lock: :until_executed, retry: 0 def perform(status_id) @status = Status.find(status_id) diff --git a/app/workers/activitypub/synchronize_featured_collection_worker.rb b/app/workers/activitypub/synchronize_featured_collection_worker.rb index 7b16d3426..7a0898e89 100644 --- a/app/workers/activitypub/synchronize_featured_collection_worker.rb +++ b/app/workers/activitypub/synchronize_featured_collection_worker.rb @@ -3,7 +3,7 @@ class ActivityPub::SynchronizeFeaturedCollectionWorker include Sidekiq::Worker - sidekiq_options queue: 'pull', unique: :until_executed + sidekiq_options queue: 'pull', lock: :until_executed def perform(account_id) ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id)) |