Skip to content

Commit 880c0e3

Browse files
ClearlyClairechrisguida
authored andcommitted
Add warning in admin dashboard if some required queues are not handled (mastodon#15954)
1 parent b5884f1 commit 880c0e3

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

app/controllers/admin/dashboard_controller.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33

44
module Admin
55
class DashboardController < BaseController
6+
SIDEKIQ_QUEUES = %w(default push mailers pull scheduler).freeze
7+
68
def index
9+
missing_queues = Sidekiq::ProcessSet.new.reduce(SIDEKIQ_QUEUES) { |queues, process| queues - process['queues'] }
10+
11+
flash.now[:alert] = I18n.t('admin.dashboard.misconfigured_sidekiq_alert', queues: missing_queues.join(', ')) unless missing_queues.empty?
12+
713
@users_count = User.count
814
@pending_users_count = User.pending.count
915
@registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0

config/locales/en.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ en:
367367
feature_timeline_preview: Timeline preview
368368
features: Features
369369
hidden_service: Federation with hidden services
370+
misconfigured_sidekiq_alert: 'No Sidekiq process seems to be handling the following queues: %{queues}. Please review your Sidekiq configuration.'
370371
open_reports: open reports
371372
pending_tags: hashtags waiting for review
372373
pending_users: users waiting for review

0 commit comments

Comments
 (0)