diff options
Diffstat (limited to 'app/controllers/health_controller.rb')
| -rw-r--r-- | app/controllers/health_controller.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb index dc9a52f8da5..b930e651fed 100644 --- a/app/controllers/health_controller.rb +++ b/app/controllers/health_controller.rb @@ -10,7 +10,7 @@ class HealthController < ActionController::Base Gitlab::HealthChecks::Redis::CacheCheck, Gitlab::HealthChecks::Redis::QueuesCheck, Gitlab::HealthChecks::Redis::SharedStateCheck, - Gitlab::HealthChecks::GitalyCheck + Gitlab::HealthChecks::GitalyCheck, ].freeze def readiness @@ -28,21 +28,21 @@ class HealthController < ActionController::Base private def render_check_results(results) - flattened = results.flat_map do |name, result| + flattened = results.flat_map { |name, result| if result.is_a?(Gitlab::HealthChecks::Result) [[name, result]] else result.map { |r| [name, r] } end - end + } success = flattened.all? { |name, r| r.success } - response = flattened.map do |name, r| - info = { status: r.success ? 'ok' : 'failed' } - info['message'] = r.message if r.message + response = flattened.map { |name, r| + info = {status: r.success ? "ok" : "failed"} + info["message"] = r.message if r.message info[:labels] = r.labels if r.labels [name, info] - end + } render json: response.to_h, status: success ? :ok : :service_unavailable end end |