From c04c6253971bf073b82f9862540e72ae0a8b6aec Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 28 Sep 2023 09:05:15 +0200 Subject: Create strings only if they will be logged --- .../src/main/java/com/yahoo/search/logging/Spooler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search/logging') diff --git a/container-search/src/main/java/com/yahoo/search/logging/Spooler.java b/container-search/src/main/java/com/yahoo/search/logging/Spooler.java index 921b8f444f1..cf750fd9d8a 100644 --- a/container-search/src/main/java/com/yahoo/search/logging/Spooler.java +++ b/container-search/src/main/java/com/yahoo/search/logging/Spooler.java @@ -85,10 +85,10 @@ public class Spooler { public void processFiles(Function transport) throws IOException { List files = listFilesInPath(readyPath); if (files.size() == 0) { - log.log(Level.FINEST, "No files in ready path " + readyPath.toFile().getAbsolutePath()); + log.log(Level.FINEST, () -> "No files in ready path " + readyPath.toFile().getAbsolutePath()); return; } - log.log(Level.FINE, "Files in ready path: " + files.size()); + log.log(Level.FINE, () -> "Files in ready path: " + files.size()); List fileList = getFiles(files); if ( ! fileList.isEmpty()) { @@ -116,7 +116,7 @@ public class Spooler { List lines = Files.readAllLines(f.toPath()); for (String line : lines) { LoggerEntry entry = LoggerEntry.deserialize(line); - log.log(Level.FINE, "Read entry " + entry + " from " + f); + log.log(Level.FINE, () -> "Read entry " + entry + " from " + f); success = transport.apply(entry); if (! success) { throw new RuntimeException("Unable to process file " + f + ": unsuccessful call to transport() for " + entry); @@ -190,7 +190,7 @@ public class Spooler { String fileName = currentFileName(); Path file = spoolPath.resolve(processingPath).resolve(fileName); try { - log.log(Level.FINE, "Writing entry " + entryCounter.get() + " (" + entry.serialize() + ") to file " + fileName); + log.log(Level.FINE, () -> "Writing entry " + entryCounter.get() + " (" + entry.serialize() + ") to file " + fileName); Files.writeString(file, entry.serialize() + "\n", StandardOpenOption.WRITE, StandardOpenOption.APPEND, StandardOpenOption.CREATE); firstWriteTimestamp.compareAndExchange(Instant.EPOCH, clock.instant()); entryCounter.incrementAndGet(); @@ -242,7 +242,7 @@ public class Spooler { if (file.exists() && file.canRead() && file.canWrite()) { log.log(Level.INFO, "Directory " + path + " already exists"); } else if (file.mkdirs()) { - log.log(Level.FINE, "Created " + path); + log.log(Level.FINE, () -> "Created " + path); } else { log.log(Level.WARNING, "Could not create " + path + ", please check permissions"); } -- cgit v1.2.3 From e258ffe91420f161dca767e8b066c2aa1f7256a3 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 28 Sep 2023 09:27:58 +0200 Subject: Make LoggerEntry.build() public --- .../src/main/java/com/yahoo/search/logging/LoggerEntry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'container-search/src/main/java/com/yahoo/search/logging') diff --git a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java index 80ff967f779..d8e656d1b2b 100644 --- a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java +++ b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java @@ -135,7 +135,7 @@ public class LoggerEntry { return logger.send(new LoggerEntry(this)); } - LoggerEntry build() { + public LoggerEntry build() { return new LoggerEntry(this); } -- cgit v1.2.3