More lazy debug log message generation

4 files changed, 6 insertions, 7 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index fbc10c772d7..3700dee92e3 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -50,7 +50,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
     public void run() {
         try {
             Acceptor acceptor = supervisor.listen(spec);
-            log.log(Level.FINE, "Ready for requests on " + spec);
+            log.log(Level.FINE, () -> "Ready for requests on " + spec);
             supervisor.transport().join();
             acceptor.shutdown().join();
         } catch (ListenFailedException e) {
@@ -284,7 +284,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
             } else if (ProxyServer.configOrGenerationHasChanged(config, request)) {
                 returnOkResponse(request, config);
             } else {
-                log.log(Level.FINEST, "No new config for " + request.getShortDescription() + ", not sending response");
+                log.log(Level.FINEST, () -> "No new config for " + request.getShortDescription() + ", not sending response");
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index ac6fac3b16c..86f2022fa82 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -109,16 +109,15 @@ public class MemoryCache {
     }
 
     private void writeConfigToFile(RawConfig config, String path) {
-        String filename = null;
+        String filename = path + File.separator + createCacheFileName(config);
         Writer writer = null;
         try {
-            filename = path + File.separator + createCacheFileName(config);
             if (log.isLoggable(Level.FINE)) {
                 log.log(Level.FINE, "Writing '" + config.getKey() + "' to '" + filename + "'");
             }
             final Payload payload = config.getPayload();
             long protocolVersion = 3;
-            log.log(Level.FINE, "Writing config '" + config + "' to file '" + filename + "' with protocol version " + protocolVersion);
+            log.log(Level.FINE, () -> "Writing config '" + config + "' to file '" + filename + "' with protocol version " + protocolVersion);
             writer = IOUtils.createWriter(filename, "UTF-8", false);
 
             // First three lines are meta-data about config as comment lines, fourth line is empty
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
index ccd53cf8491..047cec87ed7 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
@@ -57,7 +57,7 @@ public class ProxyServer implements Runnable {
     ProxyServer(Spec spec, ConfigSourceSet source, MemoryCache memoryCache, ConfigSourceClient configClient) {
         this.configSource = source;
         supervisor = new Supervisor(new Transport("proxy-server", JRT_TRANSPORT_THREADS)).useSmallBuffers();
-        log.log(Level.FINE, "Using config source '" + source);
+        log.log(Level.FINE, () -> "Using config source '" + source);
         this.memoryCache = memoryCache;
         this.rpcServer = createRpcServer(spec);
         this.configClient = (configClient == null) ? createRpcClient(rpcServer, source, memoryCache) : configClient;
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
index 247ef8a4dbf..27790eedec7 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
@@ -63,7 +63,7 @@ class CachedFilesMaintainer implements Runnable {
         File[] files = directory.listFiles();
         if (files != null)
             filesOnDisk.addAll(Arrays.stream(files).map(File::getName).collect(Collectors.toSet()));
-        log.log(Level.FINE, "Files on disk (in " + directory + "): " + filesOnDisk);
+        log.log(Level.FINE, () -> "Files on disk (in " + directory + "): " + filesOnDisk);
 
         Set<String> filesToDelete = filesOnDisk
                 .stream()