From 58f2601723f34d259691760e858507e5ee9b444b Mon Sep 17 00:00:00 2001 From: david steinsland Date: Sat, 23 Nov 2024 15:59:17 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"delay=20virker=20=C3=A5=20blokkere=20?= =?UTF-8?q?ApplicationStopPreparing-sigalet"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 445aac85ba7fa1b529dd5303da34b2bb7e6998d2. Det virket å fungere likevel, men appene bør konfigurere periodSeconds til 1, ellers ser det ikke ut til at k8s registrerer at appen ikke er ready. --- .../navikt/tbd_libs/naisful/NaisfulApp.kt | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt b/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt index 289b477..5afec5f 100644 --- a/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt +++ b/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt @@ -25,17 +25,13 @@ import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics import io.micrometer.core.instrument.binder.system.ProcessorMetrics import io.micrometer.prometheusmetrics.PrometheusMeterRegistry -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay -import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.slf4j.Logger import org.slf4j.event.Level import java.net.URI import java.util.* import java.util.concurrent.atomic.AtomicBoolean -import kotlin.system.exitProcess import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -354,16 +350,12 @@ private data class ShutdownHook( } override fun run() { - app.environment.log.info("Shut down hook called.") - runBlocking(Dispatchers.IO) { - app.apply { - environment.log.info("Raising ApplicationStopPreparing.") - monitor.raiseCatching(ApplicationStopPreparing, environment, environment.log) - environment.log.info("waiting $gracefulShutdownDelay before disposing application.") - delay(gracefulShutdownDelay) - environment.log.info("Disposing application") - application.dispose() - } + app.apply { + environment.log.info("Shut down hook called. waiting $gracefulShutdownDelay before disposing application.") + monitor.raiseCatching(ApplicationStopPreparing, environment, environment.log) + runBlocking { delay(gracefulShutdownDelay) } + environment.log.info("Disposing application") + application.dispose() } } } \ No newline at end of file