From 59f94593d059239c28ab5fb8e2a0c23ce2590254 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 26 Mar 2021 18:22:54 +0100
Subject: [PATCH] Add warning in admin dashboard if some required queues are
not handled (#15954)
---
app/controllers/admin/dashboard_controller.rb | 6 ++++++
config/locales/en.yml | 1 +
2 files changed, 7 insertions(+)
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 7c2951acbb..24162ec639 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -3,7 +3,13 @@ require 'sidekiq/api'
module Admin
class DashboardController < BaseController
+ SIDEKIQ_QUEUES = %w(default push mailers pull scheduler).freeze
+
def index
+ missing_queues = Sidekiq::ProcessSet.new.reduce(SIDEKIQ_QUEUES) { |queues, process| queues - process['queues'] }
+
+ flash.now[:alert] = I18n.t('admin.dashboard.misconfigured_sidekiq_alert', queues: missing_queues.join(', ')) unless missing_queues.empty?
+
@users_count = User.count
@pending_users_count = User.pending.count
@registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14f1a08e4b..b907d38828 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -367,6 +367,7 @@ en:
feature_timeline_preview: Timeline preview
features: Features
hidden_service: Federation with hidden services
+ misconfigured_sidekiq_alert: 'No Sidekiq process seems to be handling the following queues: %{queues}. Please review your Sidekiq configuration.'
open_reports: open reports
pending_tags: hashtags waiting for review
pending_users: users waiting for review