mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
Change health check (#15988)
This commit is contained in:
parent
abad99fa10
commit
82cce18227
1
Gemfile
1
Gemfile
|
@ -54,7 +54,6 @@ gem 'fast_blank', '~> 1.0'
|
||||||
gem 'fastimage'
|
gem 'fastimage'
|
||||||
gem 'hiredis', '~> 0.6'
|
gem 'hiredis', '~> 0.6'
|
||||||
gem 'redis-namespace', '~> 1.8'
|
gem 'redis-namespace', '~> 1.8'
|
||||||
gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
|
|
||||||
gem 'htmlentities', '~> 4.3'
|
gem 'htmlentities', '~> 4.3'
|
||||||
gem 'http', '~> 4.4'
|
gem 'http', '~> 4.4'
|
||||||
gem 'http_accept_language', '~> 2.1'
|
gem 'http_accept_language', '~> 2.1'
|
||||||
|
|
|
@ -21,14 +21,6 @@ GIT
|
||||||
sidekiq (>= 3.5)
|
sidekiq (>= 3.5)
|
||||||
statsd-ruby (~> 1.4, >= 1.4.0)
|
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
|
GIT
|
||||||
remote: https://github.com/nsommer/pluck_each
|
remote: https://github.com/nsommer/pluck_each
|
||||||
revision: 73be0947c52fc54bf6d7085378db008358aac5eb
|
revision: 73be0947c52fc54bf6d7085378db008358aac5eb
|
||||||
|
@ -755,7 +747,6 @@ DEPENDENCIES
|
||||||
fog-openstack (~> 0.3)
|
fog-openstack (~> 0.3)
|
||||||
fuubar (~> 2.5)
|
fuubar (~> 2.5)
|
||||||
hamlit-rails (~> 0.2)
|
hamlit-rails (~> 0.2)
|
||||||
health_check!
|
|
||||||
hiredis (~> 0.6)
|
hiredis (~> 0.6)
|
||||||
htmlentities (~> 4.3)
|
htmlentities (~> 4.3)
|
||||||
http (~> 4.4)
|
http (~> 4.4)
|
||||||
|
|
7
app/controllers/health_controller.rb
Normal file
7
app/controllers/health_controller.rb
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class HealthController < ActionController::Base
|
||||||
|
def show
|
||||||
|
render plain: 'OK'
|
||||||
|
end
|
||||||
|
end
|
|
@ -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
|
|
|
@ -10,7 +10,7 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development?
|
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
|
authenticate :user, lambda { |u| u.admin? } do
|
||||||
mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq
|
mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq
|
||||||
|
|
Loading…
Reference in a new issue