diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-23 14:05:27 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-23 14:19:58 +0100 |
commit | 0b7eed26fc9fb28380d38283bc31d86c86694866 (patch) | |
tree | c53d178b03ef4e32d99efceab4ca7e9691974c7c | |
parent | adc1b34c042bf6e57505e911d5ed0fff80c8fe8a (diff) |
Add newline after serialized log entry in LogFileHandler
3 files changed, 5 insertions, 5 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java index b764f813c41..bfb51d21c6c 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -173,7 +173,9 @@ class LogFileHandler <LOGTYPE> { internalRotateNow(); } try { - logWriter.write(r, currentOutputStream); + FileOutputStream out = this.currentOutputStream; + logWriter.write(r, out); + out.write('\n'); } catch (IOException e) { logger.warning("Failed writing log record: " + Exceptions.toMessageString(e)); } diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java index b74e69ce172..33ec736443c 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java @@ -9,7 +9,6 @@ import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import java.util.logging.Level; /** * @author Bjorn Borud @@ -70,8 +69,7 @@ public final class VespaAccessLog implements RequestLogHandler, LogWriter<Reques sb.append(' ') .append((hitcounts == null) ? 0 : hitcounts.getTotalHitCount()) .append(" 0.0 ") - .append((hitcounts == null) ? 0 : hitcounts.getSummaryCount()) - .append('\n'); + .append((hitcounts == null) ? 0 : hitcounts.getSummaryCount()); return sb.toString(); } diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java index 86c562f57ff..f76312af61e 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java @@ -195,7 +195,7 @@ public class LogFileHandlerTestCase { @Override public void write(String record, OutputStream outputStream) throws IOException { - outputStream.write((record + "\n").getBytes(StandardCharsets.UTF_8)); + outputStream.write(record.getBytes(StandardCharsets.UTF_8)); } } } |