From 22d44ae9a699c418aba442cd99eec8f58d5fa006 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 27 Jul 2018 12:19:51 -0700 Subject: Use /-/health instead of breaking /-/liveness --- config/application.rb | 2 +- config/routes.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index ae4ff5dd7c9..a086e860e16 100644 --- a/config/application.rb +++ b/config/application.rb @@ -156,7 +156,7 @@ module Gitlab # This middleware needs to precede ActiveRecord::QueryCache and other middlewares that # connect to the database. - config.middleware.insert_after "Rails::Rack::Logger", "Gitlab::Middleware::LivenessHealthCheck" + config.middleware.insert_after "Rails::Rack::Logger", "Gitlab::Middleware::BasicHealthCheck" config.middleware.insert_after Warden::Manager, Rack::Attack diff --git a/config/routes.rb b/config/routes.rb index 6bf0335a923..aac3a77c4f1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,7 +46,8 @@ Rails.application.routes.draw do get 'health_check(/:checks)' => 'health_check#index', as: :health_check scope path: '-' do - get 'liveness' => 'health#liveness' # Intercepted via Gitlab::Middleware::LivenessHealthCheck + # '/-/health' implemented by BasicHealthMiddleware + get 'liveness' => 'health#liveness' get 'readiness' => 'health#readiness' post 'storage_check' => 'health#storage_check' resources :metrics, only: [:index] -- cgit v1.2.1