From 3a35adc661254025c1191e168e75817840c2cfad Mon Sep 17 00:00:00 2001 From: Bjarte Stien Karlsen Date: Tue, 2 Oct 2018 08:09:58 +0200 Subject: [PATCH] bugfix fix ktlint and add some more debug statements --- src/main/http/get_aurora_application.http | 2 +- .../aurora/mokey/model/ManagementEndpointResponses.kt | 2 +- .../mokey/service/ApplicationDataServiceCacheDecorator.kt | 1 + src/main/resources/application.yaml | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/http/get_aurora_application.http b/src/main/http/get_aurora_application.http index bc5f2dcb..4b56bad1 100644 --- a/src/main/http/get_aurora_application.http +++ b/src/main/http/get_aurora_application.http @@ -1,4 +1,4 @@ -GET {{apiUrl}}/api/application?affiliation=paas +GET {{apiUrl}}/api/application?affiliation=aurora #Authorization:Bearer {{token}} # #### \ No newline at end of file diff --git a/src/main/kotlin/no/skatteetaten/aurora/mokey/model/ManagementEndpointResponses.kt b/src/main/kotlin/no/skatteetaten/aurora/mokey/model/ManagementEndpointResponses.kt index d7ec1504..01f01af2 100644 --- a/src/main/kotlin/no/skatteetaten/aurora/mokey/model/ManagementEndpointResponses.kt +++ b/src/main/kotlin/no/skatteetaten/aurora/mokey/model/ManagementEndpointResponses.kt @@ -46,7 +46,7 @@ data class HealthResponse( ) data class HealthPart( - val status: HealthStatus=HealthStatus.UP, + val status: HealthStatus = HealthStatus.UP, val details: Map = emptyMap() ) diff --git a/src/main/kotlin/no/skatteetaten/aurora/mokey/service/ApplicationDataServiceCacheDecorator.kt b/src/main/kotlin/no/skatteetaten/aurora/mokey/service/ApplicationDataServiceCacheDecorator.kt index 1e1ba5cd..4f6276d2 100644 --- a/src/main/kotlin/no/skatteetaten/aurora/mokey/service/ApplicationDataServiceCacheDecorator.kt +++ b/src/main/kotlin/no/skatteetaten/aurora/mokey/service/ApplicationDataServiceCacheDecorator.kt @@ -71,6 +71,7 @@ class ApplicationDataServiceCacheDecorator( val time = withStopWatch { val applications = applicationDataService.findAllApplicationData(affiliations) applications.forEach { + logger.debug("Added cache for deploymentId=${it.applicationDeploymentId} name=${it.applicationDeploymentName} namespace=${it.namespace}") cache[it.applicationDeploymentId] = it newKeys.add(it.applicationDeploymentId) } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index f82327c3..03b5cec1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -15,7 +15,6 @@ aurora: logging: level: - no.skatteetaten.aurora: INFO no.skatteetaten.aurora.mokey: INFO io.fabric8.openshift.client.DefaultOpenShiftClient: INFO org: @@ -37,7 +36,7 @@ spring: mokey: cache: enabled: true - affiliations: aurora,paas,sirius,safir + affiliations: aurora logging: