From 91cb329e1888fe24466f5331452d0a31682a82f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Thu, 15 Feb 2024 12:59:27 +0900 Subject: [PATCH] =?UTF-8?q?Change:=20#420=20=E7=B5=B5=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=83=BC=E3=83=9F=E3=83=B3=E3=82=B0Worker?= =?UTF-8?q?=E3=81=AE=E3=82=AD=E3=83=A5=E3=83=BC=E3=81=AE=E7=A8=AE=E9=A1=9E?= =?UTF-8?q?=E3=82=92=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90=20(#551)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Change: #420 絵文字リアクションストリーミングWorkerのキューの種類を`push`に変更 * `perishable`キュー新規作成に変更 * 優先順位を`ingress`と一緒に --- app/lib/admin/system_check/sidekiq_process_check.rb | 1 + app/workers/delivery_emoji_reaction_worker.rb | 2 ++ config/sidekiq.yml | 1 + spec/lib/admin/system_check/sidekiq_process_check_spec.rb | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb index d577b3bf3c..4c7447e4da 100644 --- a/app/lib/admin/system_check/sidekiq_process_check.rb +++ b/app/lib/admin/system_check/sidekiq_process_check.rb @@ -8,6 +8,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck pull scheduler ingress + perishable ).freeze def skip? diff --git a/app/workers/delivery_emoji_reaction_worker.rb b/app/workers/delivery_emoji_reaction_worker.rb index e38b61d9ac..6720d4623c 100644 --- a/app/workers/delivery_emoji_reaction_worker.rb +++ b/app/workers/delivery_emoji_reaction_worker.rb @@ -6,6 +6,8 @@ class DeliveryEmojiReactionWorker include Lockable include AccountScope + sidekiq_options queue: 'perishable' + def perform(payload_json, status_id, reacted_account_id) return unless Setting.enable_emoji_reaction diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 3f9cbd9a7a..f083e372c1 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -4,6 +4,7 @@ - [default, 8] - [push, 6] - [ingress, 4] + - [perishable, 4] - [mailers, 2] - [pull] - [scheduler] diff --git a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb index 9bd9daddf6..42a2922355 100644 --- a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb +++ b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb @@ -35,11 +35,11 @@ describe Admin::SystemCheck::SidekiqProcessCheck do describe 'message' do it 'sends values to message instance' do - allow(Admin::SystemCheck::Message).to receive(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress') + allow(Admin::SystemCheck::Message).to receive(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress, perishable') check.message - expect(Admin::SystemCheck::Message).to have_received(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress') + expect(Admin::SystemCheck::Message).to have_received(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress, perishable') end end end