소스 검색

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

Eugen Rochko 1 년 전
부모
커밋
f8e8e622e5
3개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 0
      app/lib/admin/system_check/sidekiq_process_check.rb
  2. 1 1
      app/workers/activitypub/processing_worker.rb
  3. 3 2
      config/sidekiq.yml

+ 1 - 0
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?

+ 1 - 1
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

+ 3 - 2
config/sidekiq.yml

@@ -1,8 +1,9 @@
 ---
 :concurrency: 5
 :queues:
-  - [default, 6]
-  - [push, 4]
+  - [default, 8]
+  - [push, 6]
+  - [ingress, 4]
   - [mailers, 2]
   - [pull]
   - [scheduler]