summaryrefslogtreecommitdiffstats
path: root/node-admin/src
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2018-03-10 17:48:37 +0100
committerHåkon Hallingstad <hakon@oath.com>2018-03-10 17:48:37 +0100
commit7a18fa6912ecf8dc486e9096c4e1108f52551adf (patch)
treee5a795fcc34b384817287b8422e1d93bfc226e5a /node-admin/src
parent7d6cdbb8528a4e95bf6722f423810dda6ab46354 (diff)
Log when certificate has been refreshed
Diffstat (limited to 'node-admin/src')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/certificate/ConfigServerKeyStoreRefresher.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/certificate/ConfigServerKeyStoreRefresher.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/certificate/ConfigServerKeyStoreRefresher.java
index bd71d661456..085e1609de7 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/certificate/ConfigServerKeyStoreRefresher.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/certificate/ConfigServerKeyStoreRefresher.java
@@ -1,6 +1,7 @@
// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.node.admin.configserver.certificate;
+import com.yahoo.log.LogLevel;
import com.yahoo.net.HostName;
import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi;
import com.yahoo.vespa.hosted.node.admin.util.KeyStoreOptions;
@@ -22,6 +23,7 @@ import java.security.NoSuchProviderException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.time.Clock;
+import java.time.format.DateTimeFormatter;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -109,6 +111,10 @@ public class ConfigServerKeyStoreRefresher {
X509Certificate certificate = sendCsr(csr);
storeCertificate(keyPair, certificate);
+
+ String expiry = DateTimeFormatter.ISO_INSTANT.format(certificate.getNotAfter().toInstant());
+ logger.log(LogLevel.INFO, "Key store certificate refreshed, expires " + expiry);
+
return true;
}