diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-11-10 14:21:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 14:21:51 +0100 |
| commit | f8e8e622e56262e810529cbe896d817cd28d5bbb (patch) | |
| tree | 4b1e0dd461ef250c354c19c4c072aba2a0e7de6b | |
| parent | 89a6b76f999635e077e9469efd9d94cd6c6d6222 (diff) | |
Change incoming activity processing to happen in `ingress` queue (#20264)
| -rw-r--r-- | app/lib/admin/system_check/sidekiq_process_check.rb | 1 | ||||
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 | ||||
| -rw-r--r-- | config/sidekiq.yml | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb index 648811d6c..d577b3bf3 100644 --- a/app/lib/admin/system_check/sidekiq_process_check.rb +++ b/app/lib/admin/system_check/sidekiq_process_check.rb @@ -7,6 +7,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck mailers pull scheduler + ingress ).freeze def skip? diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index 4d06ad079..5e36fab51 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -3,7 +3,7 @@ class ActivityPub::ProcessingWorker 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') case actor_type diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 71e7cb33d..05c5b28c8 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,8 +1,9 @@ --- :concurrency: 5 :queues: - - [default, 6] - - [push, 4] + - [default, 8] + - [push, 6] + - [ingress, 4] - [mailers, 2] - [pull] - [scheduler] |