diff options
| author | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
| commit | 54e480ca0939ba737f5abdf4ee861cd63c025865 (patch) | |
| tree | 760cdd75fd0922266b60e784c06db99902ef5692 /app/workers/activitypub | |
| parent | ff9a09a9a7f73b558c53f334573b94198eb8d08a (diff) | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/low_priority_delivery_worker.rb | 5 | ||||
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/workers/activitypub/low_priority_delivery_worker.rb b/app/workers/activitypub/low_priority_delivery_worker.rb new file mode 100644 index 000000000..a141b8f78 --- /dev/null +++ b/app/workers/activitypub/low_priority_delivery_worker.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class ActivityPub::LowPriorityDeliveryWorker < ActivityPub::DeliveryWorker + sidekiq_options queue: 'pull', retry: 8, dead: false +end diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index a8a3ebf0f..a3abe72cf 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -6,6 +6,6 @@ class ActivityPub::ProcessingWorker sidekiq_options backtrace: true def perform(account_id, body, delivered_to_account_id = nil) - ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id) + ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true) end end |