diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-06 23:20:02 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-29 00:35:02 +0300 |
| commit | eb2bc7d99a99981150f32ac2469bff29eebbfa19 (patch) | |
| tree | 89fa9dab380931b67718443ab17f61c486df12c9 /config | |
| parent | 87f03f01735fb4b6dbef2e4bf625cf2546523a4e (diff) | |
Simplify /-/liveness check to avoid connecting to the database
The previous implementation would hit the database each time
and provide a dummy response. If the database goes down, this
means all application workers would be taken out of service.
Simplify this check by using a Rails middleware that intercepts
this endpoint and returns a 200 response.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index b9d4f6765e3..ae4ff5dd7c9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -154,6 +154,10 @@ module Gitlab config.action_view.sanitized_allowed_protocols = %w(smb) + # 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 Warden::Manager, Rack::Attack # Allow access to GitLab API from other domains diff --git a/config/routes.rb b/config/routes.rb index e0a9139b1b4..6bf0335a923 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,7 +46,7 @@ Rails.application.routes.draw do get 'health_check(/:checks)' => 'health_check#index', as: :health_check scope path: '-' do - get 'liveness' => 'health#liveness' + get 'liveness' => 'health#liveness' # Intercepted via Gitlab::Middleware::LivenessHealthCheck get 'readiness' => 'health#readiness' post 'storage_check' => 'health#storage_check' resources :metrics, only: [:index] |