mirror of https://github.com/tootsuite/mastodon
Change incoming activity processing to happen in `ingress` queue (#20264)
parent
89a6b76f99
commit
f8e8e622e5
|
@ -7,6 +7,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck
|
||||||
mailers
|
mailers
|
||||||
pull
|
pull
|
||||||
scheduler
|
scheduler
|
||||||
|
ingress
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
def skip?
|
def skip?
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class ActivityPub::ProcessingWorker
|
class ActivityPub::ProcessingWorker
|
||||||
include Sidekiq::Worker
|
include Sidekiq::Worker
|
||||||
|
|
||||||
sidekiq_options backtrace: true, retry: 8
|
sidekiq_options queue: 'ingress', backtrace: true, retry: 8
|
||||||
|
|
||||||
def perform(actor_id, body, delivered_to_account_id = nil, actor_type = 'Account')
|
def perform(actor_id, body, delivered_to_account_id = nil, actor_type = 'Account')
|
||||||
case actor_type
|
case actor_type
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
---
|
---
|
||||||
:concurrency: 5
|
:concurrency: 5
|
||||||
:queues:
|
:queues:
|
||||||
- [default, 6]
|
- [default, 8]
|
||||||
- [push, 4]
|
- [push, 6]
|
||||||
|
- [ingress, 4]
|
||||||
- [mailers, 2]
|
- [mailers, 2]
|
||||||
- [pull]
|
- [pull]
|
||||||
- [scheduler]
|
- [scheduler]
|
||||||
|
|
Loading…
Reference in New Issue