Merge pull request #16178 from vespa-engine/mortent/log-fix-newline

Add missing new line

3 files changed, 4 insertions, 2 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
index 15a38f6eeae..c42cc8dff4a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java
@@ -96,7 +96,7 @@ public class ConnectionLogEntry {
         setString(cursor, sslHandshakeFailureException, "ssl", "handshake-failure", "exception");
         setString(cursor, sslHandshakeFailureMessage, "ssl", "handshake-failure", "message");
         setString(cursor, sslHandshakeFailureType, "ssl", "handshake-failure", "type");
-        return new String(Exceptions.uncheck(() -> SlimeUtils.toJsonBytes(slime)), StandardCharsets.UTF_8);
+        return new String(Exceptions.uncheck(() -> SlimeUtils.toJsonBytes(slime)), StandardCharsets.UTF_8)+"\n";
     }
 
     private void setString(Cursor cursor, String value, String... keys) {
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java
index c6d177684ac..10ea1cccdec 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java
@@ -9,6 +9,7 @@ import com.yahoo.yolean.trace.TraceNode;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.util.Collection;
 import java.util.Objects;
@@ -146,6 +147,7 @@ public class JSONFormatter implements LogWriter<RequestLogEntry> {
             }
 
             generator.writeEndObject();
+            outputStream.write("\n".getBytes(StandardCharsets.UTF_8));
         } catch (IOException e) {
             logger.log(Level.WARNING, "Unable to generate JSON access log entry: " + e.getMessage(), e);
         }
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java b/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java
index fbf9bd1dc23..1557819d5f6 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java
@@ -26,7 +26,7 @@ public class ConnectionLogEntryTest {
                           "\"id\":\""+id.toString()+"\"," +
                           "\"timestamp\":\"2021-01-13T12:12:12Z\"," +
                           "\"peerPort\":1234" +
-                          "}";
+                          "}\n";
         Assert.assertEquals(expected, entry.toJson());
     }
 }