Fix

wttech · Mar 3, 2021 · 3f35960 · 3f35960
1 parent fa1e7f2
commit 3f35960
Showing 1 changed file with 5 additions and 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
@@ -66,6 +66,8 @@ class HealthChecker(val common: CommonExtension) {
 
  var all = listOf<HealthStatus>()
 
+ val allStatuses get() = all.sortedWith(compareBy({ it.succeed }, { it.check.name })).joinToString("\n")
+
  var passed = listOf<HealthStatus>()
 
  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