summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2022-11-10 14:21:51 +0100
committerGitHub <noreply@github.com>2022-11-10 14:21:51 +0100
commitf8e8e622e56262e810529cbe896d817cd28d5bbb (patch)
tree4b1e0dd461ef250c354c19c4c072aba2a0e7de6b /app
parent89a6b76f999635e077e9469efd9d94cd6c6d6222 (diff)
Change incoming activity processing to happen in `ingress` queue (#20264)
Diffstat (limited to 'app')
-rw-r--r--app/lib/admin/system_check/sidekiq_process_check.rb1
-rw-r--r--app/workers/activitypub/processing_worker.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb
index 648811d6c1a..d577b3bf3c5 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 4d06ad07960..5e36fab51e5 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