Health checker imprs

wttech · Apr 14, 2021 · 7c65281 · 7c65281
1 parent 323715d
commit 7c65281
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/kotlin/com/cognifide/gradle/common/health/HealthCheck.kt b/src/main/kotlin/com/cognifide/gradle/common/health/HealthCheck.kt
@@ -2,11 +2,9 @@ package com.cognifide.gradle.common.health
 
 class HealthCheck(val name: String, val action: () -> Any?) {
 
-    private var result: Any? = null
-
     @Suppress("TooGenericExceptionCaught")
     fun perform(): HealthStatus = try {
-        HealthStatus(this, true, action())
+        HealthStatus(this, true, action().takeIf { it != Unit })
     } catch (e: Exception) {
         HealthStatus(this, false, e.message)
     }

diff --git a/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt b/src/main/kotlin/com/cognifide/gradle/common/health/HealthChecker.kt
@@ -171,6 +171,7 @@ class HealthChecker(val common: CommonExtension) {
     }
 
     fun noHttp(checkName: String, url: String, criteria: HttpCheck.() -> Unit = {}) = check(checkName) {
+        var result: Any? = null
         common.http {
             val check = HttpCheck(url).apply(criteria)
             apply(httpOptions)
@@ -185,20 +186,25 @@ class HealthChecker(val common: CommonExtension) {
             }
             if (responds) {
                 throw IllegalStateException("HTTP ${check.method.toUpperCase()} '${check.url}' is available")
+            } else {
+                result = "${check.method} ${check.url} -> unavailable"
             }
         }
+        result
     }
 
     fun host(checkName: String, hostName: String, port: Int, timeout: Int = 1000) = check(checkName) {
         if (!NetUtils.isHostReachable(hostName, port, timeout)) {
             throw IllegalStateException("Host '$hostName' at port $port is not reachable")
         }
+        "$hostName:$port -> reachable"
     }
 
     fun noHost(checkName: String, hostName: String, port: Int, timeout: Int = 1000) = check(checkName) {
         if (NetUtils.isHostReachable(hostName, port, timeout)) {
             throw IllegalStateException("Host '$hostName' at port $port is reachable")
         }
+        "$hostName:$port -> unreachable"
     }
 
     // Default options