diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-04-06 11:17:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-06 11:17:52 +0200 |
commit | df326b8b5c0659edb2aca77690a892f228b0e099 (patch) | |
tree | 0d6b014047fa80270377b83e313aa882923c9429 /app/controllers | |
parent | 39b9a0619ab4ba68ed429152153cf0dbbfcd5a5a (diff) | |
parent | 5c225b03db280c94dc3519dc5bad2cac86487e9b (diff) |
Merge pull request #1519 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 7 | ||||
-rw-r--r-- | app/controllers/health_controller.rb | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index e87dd076f..9e921fb95 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -3,13 +3,8 @@ 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? - + @system_checks = Admin::SystemCheck.perform @users_count = User.count @pending_users_count = User.pending.count @registrations_week = Redis.current.get("activity:accounts:local:#{current_week}") || 0 diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb new file mode 100644 index 000000000..2a22a0557 --- /dev/null +++ b/app/controllers/health_controller.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class HealthController < ActionController::Base + def show + render plain: 'OK' + end +end |