From 82cce18227419a55a12e34652a944fd612a86891 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 3 Apr 2021 02:39:04 +0200 Subject: [PATCH] Change health check (#15988) --- Gemfile | 1 - Gemfile.lock | 9 --------- app/controllers/health_controller.rb | 7 +++++++ config/initializers/health_check.rb | 8 -------- config/routes.rb | 2 +- 5 files changed, 8 insertions(+), 19 deletions(-) create mode 100644 app/controllers/health_controller.rb delete mode 100644 config/initializers/health_check.rb diff --git a/Gemfile b/Gemfile index 880bb8b517e..a813e82f29c 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,6 @@ gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'hiredis', '~> 0.6' gem 'redis-namespace', '~> 1.8' -gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b' gem 'htmlentities', '~> 4.3' gem 'http', '~> 4.4' gem 'http_accept_language', '~> 2.1' diff --git a/Gemfile.lock b/Gemfile.lock index aa2fdd52880..1768dd2533a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,14 +21,6 @@ GIT sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) -GIT - remote: https://github.com/ianheggie/health_check - revision: 0b799ead604f900ed50685e9b2d469cd2befba5b - ref: 0b799ead604f900ed50685e9b2d469cd2befba5b - specs: - health_check (4.0.0.pre) - rails (>= 4.0) - GIT remote: https://github.com/nsommer/pluck_each revision: 73be0947c52fc54bf6d7085378db008358aac5eb @@ -755,7 +747,6 @@ DEPENDENCIES fog-openstack (~> 0.3) fuubar (~> 2.5) hamlit-rails (~> 0.2) - health_check! hiredis (~> 0.6) htmlentities (~> 4.3) http (~> 4.4) diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb new file mode 100644 index 00000000000..2a22a05570d --- /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 diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb deleted file mode 100644 index 6f1e78fed99..00000000000 --- a/config/initializers/health_check.rb +++ /dev/null @@ -1,8 +0,0 @@ -HealthCheck.setup do |config| - config.uri = 'health' - - config.standard_checks = %w(database migrations cache) - config.full_checks = %w(database migrations cache) - - config.include_error_in_response_body = false -end diff --git a/config/routes.rb b/config/routes.rb index 780a52b0ced..fa1138868ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,7 +10,7 @@ Rails.application.routes.draw do mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development? - health_check_routes + get 'health', to: 'health#show' authenticate :user, lambda { |u| u.admin? } do mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq