diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-23 14:02:50 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-23 14:02:50 +0100 |
commit | adc1b34c042bf6e57505e911d5ed0fff80c8fe8a (patch) | |
tree | 659d07e054009804a1ecb47803bdd59616d972a0 /jdisc_http_service | |
parent | 3c8533f0ee5cc3abff0cc1bfc88fd00df0624921 (diff) |
Revert "Add missing new line"
This reverts commit 532e8963819d4ef4d7ee1af2614d3217fc247c9f.
Diffstat (limited to 'jdisc_http_service')
3 files changed, 2 insertions, 4 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 c42cc8dff4a..15a38f6eeae 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)+"\n"; + return new String(Exceptions.uncheck(() -> SlimeUtils.toJsonBytes(slime)), StandardCharsets.UTF_8); } 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 10ea1cccdec..c6d177684ac 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,7 +9,6 @@ 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; @@ -147,7 +146,6 @@ 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 1557819d5f6..fbf9bd1dc23 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()); } } |