la til et webapi + fikset litt logging

navikt · Feb 12, 2025 · d4d7b3a · d4d7b3a
1 parent 12df674
commit d4d7b3a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 97 deletions.
diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml
diff --git a/nais/unleash-apitoken-dev-gcp.yml b/nais/unleash-apitoken-dev-gcp.yml
diff --git a/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/ScheduledTasksConfig.kt b/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/ScheduledTasksConfig.kt
@@ -24,7 +24,6 @@ class ScheduledTasksConfig(
         filInfoRepository: FilInfoRepository
     ): FinnNyeFilerTask {
         return FinnNyeFilerTask(
-            filInfoRepository = filInfoRepository,
             filsluseKlient = filsluseKlient
         )
     }

diff --git a/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/tasks/FinnNyeFilerTask.kt b/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/tasks/FinnNyeFilerTask.kt
@@ -2,11 +2,9 @@ package no.nav.pensjon.opptjening.filadapter.tasks
 
 import no.nav.pensjon.opptjening.filadapter.log.NAVLog
 import no.nav.pensjon.opptjening.filadapter.remote.filsluse.FilsluseKlient
-import no.nav.pensjon.opptjening.filadapter.repository.FilInfoRepository
 import org.springframework.scheduling.annotation.Scheduled
 
 class FinnNyeFilerTask(
-    private val filInfoRepository: FilInfoRepository,
     private val filsluseKlient: FilsluseKlient,
 ) {
     companion object {
@@ -15,11 +13,16 @@ class FinnNyeFilerTask(
 
     @Scheduled(cron = "0 */15 * * * *")
     fun finnNyeFiler() {
-        val filer = filsluseKlient.scanForFiles("/")
-        log.open.info("Scannet og fant ${filer.size} filer")
-        log.open.info("Scannet og fant ${filer.size} filer")
-        filer.forEach {
-            log.secure.info("Remote file: $it")
+        try {
+            val filer = filsluseKlient.scanForFiles("/")
+            log.open.info("Scannet og fant ${filer.size} filer")
+            log.open.info("Scannet og fant ${filer.size} filer")
+            filer.forEach {
+                log.secure.info("Remote file: $it")
+            }
+        } catch (t: Throwable) {
+            log.open.info("Scanning av filer feilet")
+            log.secure.info("Scanning av filer feilet", t)
         }
     }
 }
diff --git a/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/web/AdminWebApi.kt b/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/web/AdminWebApi.kt
@@ -0,0 +1,22 @@
+package no.nav.pensjon.opptjening.filadapter.web
+
+import no.nav.pensjon.opptjening.filadapter.log.NAVLog
+import no.nav.security.token.support.core.api.Protected
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@Protected
+class AdminWebApi(
+) {
+    companion object {
+        private val log = NAVLog(AdminWebApi::class)
+    }
+
+    @GetMapping("/ping")
+    fun ping(): ResponseEntity<String> {
+        log.open.info("Sa hei")
+        return ResponseEntity.ok("pong")
+    }
+}