Merge pull request #4693 from navikt/feature/ktor

feature/ktor
navikt · Nov 28, 2024 · 2b4e09d · 2b4e09d
2 parents 0b4e508 + 8e5afc5
commit 2b4e09d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/Application.kt b/mulighetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/Application.kt
@@ -52,18 +52,16 @@ fun Application.configure(config: AppConfig) {
 
     val scheduler: Scheduler by inject()
 
-    environment.monitor.subscribe(ApplicationStarted) {
+    monitor.subscribe(ApplicationStarted) {
         kafka.enableFailedRecordProcessor()
 
         scheduler.start()
     }
 
-    environment.monitor.subscribe(ApplicationStopPreparing) {
+    monitor.subscribe(ApplicationStopPreparing) {
         kafka.disableFailedRecordProcessor()
         kafka.stopPollingTopicChanges()
 
-        scheduler.stop()
-
         db.close()
     }
 }
diff --git a/...ghetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/plugins/DependencyInjection.kt b/...ghetsrommet-api/src/main/kotlin/no/nav/mulighetsrommet/api/plugins/DependencyInjection.kt
@@ -474,6 +474,7 @@ private fun tasks(config: TaskConfig) = module {
                 generateRefusjonskrav.task,
             )
             .serializer(DbSchedulerKotlinSerializer())
+            .registerShutdownHook()
             .build()
     }
 }
diff --git a/...srommet-arena-adapter/src/main/kotlin/no/nav/mulighetsrommet/arena/adapter/Application.kt b/...srommet-arena-adapter/src/main/kotlin/no/nav/mulighetsrommet/arena/adapter/Application.kt
@@ -56,7 +56,7 @@ fun Application.configure(config: AppConfig) {
         }
     }
 
-    environment.monitor.subscribe(ApplicationStarted) {
+    monitor.subscribe(ApplicationStarted) {
         if (config.enableFailedRecordProcessor) {
             kafka.enableFailedRecordProcessor()
         }
@@ -66,12 +66,10 @@ fun Application.configure(config: AppConfig) {
         replayEvents.schedule(Instant.now().plusSeconds(60))
     }
 
-    environment.monitor.subscribe(ApplicationStopPreparing) {
+    monitor.subscribe(ApplicationStopPreparing) {
         kafka.disableFailedRecordProcessor()
         kafka.stopPollingTopicChanges()
 
-        scheduler.stop()
-
         db.close()
     }
 }
diff --git a/...apter/src/main/kotlin/no/nav/mulighetsrommet/arena/adapter/plugins/DependencyInjection.kt b/...apter/src/main/kotlin/no/nav/mulighetsrommet/arena/adapter/plugins/DependencyInjection.kt
@@ -72,6 +72,7 @@ private fun tasks(tasks: TaskConfig) = module {
             .addSchedulerListener(SlackNotifierSchedulerListener(get()))
             .addSchedulerListener(OpenTelemetrySchedulerListener())
             .startTasks(retryFailedEvents.task, notifyFailedEvents.task)
+            .registerShutdownHook()
             .build()
     }
 }

diff --git a/...t-tiltakshistorikk/src/main/kotlin/no/nav/mulighetsrommet/tiltakshistorikk/Application.kt b/...t-tiltakshistorikk/src/main/kotlin/no/nav/mulighetsrommet/tiltakshistorikk/Application.kt
@@ -63,11 +63,11 @@ fun Application.configure(config: AppConfig) {
         tiltakshistorikkRoutes(deltakerRepository, tiltakshistorikkService)
     }
 
-    environment.monitor.subscribe(ApplicationStarted) {
+    monitor.subscribe(ApplicationStarted) {
         kafka.enableFailedRecordProcessor()
     }
 
-    environment.monitor.subscribe(ApplicationStopPreparing) {
+    monitor.subscribe(ApplicationStopPreparing) {
         kafka.disableFailedRecordProcessor()
         kafka.stopPollingTopicChanges()