From eb2bc7d99a99981150f32ac2469bff29eebbfa19 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 6 Jul 2018 13:20:02 -0700 Subject: 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. --- config/application.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/application.rb') 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 -- cgit v1.2.3