Separate reloader retry value

Author: Krystian Panek

src/main/kotlin/com/cognifide/gradle/environment/EnvironmentExtension.kt

@@ -1,6 +1,7 @@
 package com.cognifide.gradle.environment
 
 import com.cognifide.gradle.common.CommonExtension
+import com.cognifide.gradle.common.build.Retry
 import com.cognifide.gradle.common.utils.using
 import com.cognifide.gradle.environment.docker.Docker
 import com.cognifide.gradle.environment.health.HealthChecker
@@ -100,14 +101,17 @@ open class EnvironmentExtension(val project: Project) : Serializable {
         logger.info("Destroyed: $this")
     }
 
-    fun check(verbose: Boolean = true): List<HealthStatus> {
+    fun check(verbose: Boolean = true, retry: Retry? = null): List<HealthStatus> {
         if (!up) {
             throw EnvironmentException("Cannot check environment as it is not up!")
         }
 
         logger.info("Checking $this")
 
-        return healthChecker.check(verbose)
+        return when {
+            retry != null -> healthChecker.check(verbose, retry)
+            else -> healthChecker.check(verbose)
+        }
     }
 
     fun reload() {

src/main/kotlin/com/cognifide/gradle/environment/health/HealthChecker.kt

@@ -1,5 +1,6 @@
 package com.cognifide.gradle.environment.health
 
+import com.cognifide.gradle.common.build.Retry
 import com.cognifide.gradle.common.http.HttpClient
 import com.cognifide.gradle.common.utils.Formats
 import com.cognifide.gradle.environment.EnvironmentExtension
@@ -27,7 +28,7 @@ class HealthChecker(val environment: EnvironmentExtension) {
         }
     }
 
-    var retry = common.retry { afterSquaredSecond(prop.long("environment.health.retry") ?: 6) }
+    var retry = common.retry { afterSquaredSecond(prop.long("environment.health.retry") ?: 7) }
 
     fun check(name: String, check: () -> Unit) {
         checks += HealthCheck(name, check)
@@ -38,7 +39,7 @@ class HealthChecker(val environment: EnvironmentExtension) {
     // Evaluation
 
     @Suppress("ComplexMethod")
-    fun check(verbose: Boolean = true): List<HealthStatus> {
+    fun check(verbose: Boolean = true, retry: Retry = this.retry): List<HealthStatus> {
         var all = listOf<HealthStatus>()
         var passed = listOf<HealthStatus>()
         var failed = listOf<HealthStatus>()

src/main/kotlin/com/cognifide/gradle/environment/reloader/Reloader.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ReceiveChannel
 import java.util.*
 
-@UseExperimental(ObsoleteCoroutinesApi::class)
+@OptIn(ObsoleteCoroutinesApi::class)
 open class Reloader(val environment: EnvironmentExtension) {
 
     private val common = environment.common
@@ -25,6 +25,8 @@ open class Reloader(val environment: EnvironmentExtension) {
 
     val configured get() = watchedContainers.isNotEmpty()
 
+    val retry = common.retry { afterSquaredSecond(common.prop.long("environment.reloader.retry") ?: 3) }
+
     fun start() {
         runBlocking {
             watchContainerFileChanges()
@@ -76,7 +78,7 @@ open class Reloader(val environment: EnvironmentExtension) {
     private fun CoroutineScope.checkHealthAfterReload() = launch {
         while (true) {
             healthCheckRequests.receiveAvailable()
-            environment.check(false)
+            environment.check(false, retry)
         }
     }