Add overloads taking supplier and throwable

1 files changed, 9 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
index 154d2d0f2f0..042aa2423f3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
@@ -11,6 +11,7 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.server.session.PrepareParams;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -35,15 +36,17 @@ public class DeployHandlerLogger implements DeployLogger {
         this.logroot = slime.setObject().setArray("log");
     }
 
+    @Override public void log(Level level, String message) { log(level, () -> message); }
+    @Override public void log(Level level, Supplier<String> message) { log(level, message, null); }
+
     @Override
     @SuppressWarnings("deprecation")
-    public void log(Level level, String message) {
-        if (level.intValue() <= LogLevel.DEBUG.intValue() && !verbose)
-            return;
+    public void log(Level level, Supplier<String> supplier, Throwable throwable) {
+        // Also tee to a normal log, Vespa log for example, but use level fine
+        log.log(Level.FINE, throwable, () -> prefix + supplier.get());
 
-        logJson(level, message);
-        // Also tee to a normal log, Vespa log for example, but use level fine 
-        log.log(Level.FINE, () -> prefix + message);
+        if (level.intValue() <= LogLevel.DEBUG.intValue() && !verbose) return;
+        logJson(level, supplier.get());
     }
 
     @Override