diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-01-05 15:13:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-05 15:13:52 +0100 |
commit | d81121c2aa0dfb1874d8ba326d53a2a4b30bd146 (patch) | |
tree | 004244c17f6d98301d350dad890d0e485742e0a1 | |
parent | 6e1a1c031763d6e47fe78be17ed80b1b78249ce0 (diff) | |
parent | 8d9cdc9532c56f23016993265866c543f092a395 (diff) |
Merge pull request #20661 from vespa-engine/mpolden/reduce-log-level
Reduce log level
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java index e96afd0ba8a..ea76b0684a3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java @@ -26,6 +26,7 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.OptionalInt; import java.util.Set; @@ -148,11 +149,10 @@ public class EndpointCertificateMaintainer extends ControllerMaintainer { } private boolean hasNoDeployments(ApplicationId applicationId) { - var deployments = curator.readApplication(TenantAndApplicationId.from(applicationId)) - .flatMap(app -> app.get(applicationId.instance())) - .map(Instance::deployments); - - return deployments.isEmpty() || deployments.get().size() == 0; + return controller().applications().getInstance(applicationId) + .map(Instance::deployments) + .orElseGet(Map::of) + .isEmpty(); } private void deleteOrReportUnmanagedCertificates() { @@ -171,7 +171,7 @@ public class EndpointCertificateMaintainer extends ControllerMaintainer { endpointCertificateProvider.deleteCertificate(ApplicationId.fromSerializedForm("applicationid:is:unknown"), providerCertificateMetadata.requestId()); } } else { - log.log(Level.INFO, String.format("Found unmaintained certificate with request_id %s and SANs %s", + log.log(Level.FINE, () -> String.format("Found unmaintained certificate with request_id %s and SANs %s", providerCertificateMetadata.requestId(), providerCertificateMetadata.dnsNames().stream().map(d -> d.dnsName).collect(Collectors.joining(", ")))); } |