More lazy debug log message generation

4 files changed, 10 insertions, 11 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
index c9b3c4f9b4a..830d66d38f5 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -200,7 +200,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
 
         @Override
         public void run() {
-            log.log(Level.FINE, "Submitting after having waited " + delay + " ms in LATER queue: " + processingTask);
+            log.log(Level.FINE, () -> "Submitting after having waited " + delay + " ms in LATER queue: " + processingTask);
             processingTask.submit();
         }
     }
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
index 8b330c13dff..5d5f63d3958 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
@@ -112,8 +112,7 @@ public class DocumentProcessingTask implements Runnable {
                 } else {
                     location = "no processing instance";
                 }
-                String errorMsg = processing + " failed, " + location;
-                log.log(Level.FINE, "Time is up for '" + errorMsg + "'.");
+                log.log(Level.FINE, () -> "Time is up for '" + processing + " failed, " + location + "'.");
                 requestContext.processingFailed(RequestContext.ErrorCode.ERROR_PROCESSING_FAILURE, "Time is up.");
                 return progress;
             }
@@ -203,7 +202,7 @@ public class DocumentProcessingTask implements Runnable {
         if (exception != null) {
             StringWriter backtrace = new StringWriter();
             exception.printStackTrace(new PrintWriter(backtrace));
-            log.log(Level.FINE, "Failed to process " + processing + ": " + backtrace.toString());
+            log.log(Level.FINE, () -> "Failed to process " + processing + ": " + backtrace);
         }
     }
 
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
index 406fc9a6db9..a91565dcd9c 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
@@ -59,7 +59,7 @@ public class JoinerDocumentProcessor extends DocumentProcessor {
             if (op instanceof DocumentPut) {
                 innerDocuments.add(((DocumentPut)op).getDocument());
             } else {
-                log.log(Level.FINE, "Skipping: " + op);
+                log.log(Level.FINE, () -> "Skipping: " + op);
             }
         }
         processing.getDocumentOperations().clear();
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
index dfc36bfb641..43e9c95fc1d 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
@@ -42,8 +42,8 @@ public class SplitterDocumentProcessor extends DocumentProcessor {
     public Progress process(Processing processing) {
         if (processing.getDocumentOperations().size() != 1) {
             //we were given more than one document, return
-            log.log(Level.FINE, "More than one document given, returning. (Was given "
-                                    + processing.getDocumentOperations().size() + " documents).");
+            log.log(Level.FINE, () -> "More than one document given, returning. (Was given "
+                                          + processing.getDocumentOperations().size() + " documents).");
             return Progress.DONE;
         }
 
@@ -57,15 +57,15 @@ public class SplitterDocumentProcessor extends DocumentProcessor {
         Array<Document> innerDocuments = (Array<Document>) outerDoc.getFieldValue(arrayFieldName);
         if (innerDocuments == null) {
             //the document does not have the field, return
-            log.log(Level.FINE, "The given Document does not have a field value for field "
-                                    + arrayFieldName + ", returning. (Was given " + outerDoc + ").");
+            log.log(Level.FINE, () -> "The given Document does not have a field value for field "
+                                          + arrayFieldName + ", returning. (Was given " + outerDoc + ").");
             return Progress.DONE;
         }
 
         if (innerDocuments.size() == 0) {
             //the array is empty, return
-            log.log(Level.FINE, "The given Document does not have any elements in array field "
-                                    + arrayFieldName + ", returning. (Was given " + outerDoc + ").");
+            log.log(Level.FINE, () -> "The given Document does not have any elements in array field "
+                                          + arrayFieldName + ", returning. (Was given " + outerDoc + ").");
             return Progress.DONE;
         }