diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-01-23 10:34:33 +0100 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-01-23 10:34:33 +0100 |
commit | 532e8963819d4ef4d7ee1af2614d3217fc247c9f (patch) | |
tree | 5212ebf64ba6571df1181cd2967c3b724c5d7b4f /jdisc_http_service/src/main/java | |
parent | 81b16feadd6caf6f1b797885de2683bf70818472 (diff) |
Add missing new line
Diffstat (limited to 'jdisc_http_service/src/main/java')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogEntry.java | 2 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONFormatter.java | 2 |
2 files changed, 3 insertions, 1 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); } |