monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change incoming activity processing to happen in `ingress` queue (#20264)

This commit is contained in:
Eugen Rochko 2022-11-10 14:21:51 +01:00 committed by GitHub
parent 89a6b76f99
commit f8e8e622e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/lib/admin/system_check/sidekiq_process_check.rb
View File

@ -7,6 +7,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck
mailers mailers
pull pull
scheduler scheduler
ingress
).freeze ).freeze
def skip? def skip?

2
app/workers/activitypub/processing_worker.rb
View File

@ -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

5
config/sidekiq.yml
View File

@ -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]