From 3f3596050429293d5b7ad1425734167ccd851430 Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Wed, 3 Mar 2021 14:24:19 +0100 Subject: [PATCH] Fix --- .../cognifide/gradle/common/health/HealthChecker.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt b/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt index 4da27ec..9b23a67 100644 --- a/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt +++ b/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt @@ -66,6 +66,8 @@ class HealthChecker(val common: CommonExtension) { var all = listOf() + val allStatuses get() = all.sortedWith(compareBy({ it.succeed }, { it.check.name })).joinToString("\n") + var passed = listOf() val passedRatio get() = "${passed.size}/${all.size} (${Formats.percent(passed.size, all.size)})" @@ -84,12 +86,10 @@ class HealthChecker(val common: CommonExtension) { assuranceRetry.withSleepTillEnd { no -> step = "Health checking ($no/${assuranceRetry.times})" start(retry, verbose) + logger.lifecycle("Health checking passed ($no/${assuranceRetry.times})") } } catch (e: HealthException) { - val message = listOf( - "Health checking failed. Success ratio: $passedRatio:", - all.sortedWith(compareBy({ it.succeed }, { it.check.name })).joinToString("\n") - ).joinToString("\n") + val message = "Health checking failed. Success ratio: $passedRatio:\n$allStatuses" when { verbose -> throw HealthException(message) else -> logger.error(message) @@ -101,9 +101,7 @@ class HealthChecker(val common: CommonExtension) { common.progressCountdown(waitAfter.get()) } - val message = "Health checking succeed.\n" + - all.sortedWith(compareBy({ it.succeed }, { it.check.name })).joinToString("\n") - logger.lifecycle(message) + logger.lifecycle("Health checking succeed.\n$allStatuses") } return all