From 389ce2f7011e17d7238a0cf5c63fd29bd153475f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 19 Feb 2023 09:36:04 +0100 Subject: [PATCH] Only output if there's a failure --- lib/mrsk/cli/healthcheck.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/mrsk/cli/healthcheck.rb b/lib/mrsk/cli/healthcheck.rb index 831fdd27..f348244a 100644 --- a/lib/mrsk/cli/healthcheck.rb +++ b/lib/mrsk/cli/healthcheck.rb @@ -14,6 +14,8 @@ class Mrsk::Cli::Healthcheck < Mrsk::Cli::Base raise SSHKit::Command::Failed, "#{target} failed to return 200 OK!" end rescue SSHKit::Command::Failed => e + error capture_with_info(*MRSK.healthcheck.logs) + if e.message =~ /curl/ # Catches 4xx, 5xx raise SSHKit::Command::Failed, "#{target} failed to return 200 OK!" @@ -21,7 +23,6 @@ class Mrsk::Cli::Healthcheck < Mrsk::Cli::Base raise end ensure - error capture_with_info(*MRSK.healthcheck.logs) execute *MRSK.healthcheck.stop, raise_on_non_zero_exit: false execute *MRSK.healthcheck.remove, raise_on_non_zero_exit: false end