windows fix

osiegmar · Oct 8, 2023 · 819ee77 · 819ee77
1 parent 3951e2c
commit 819ee77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/de/siegmar/logbackgelf/SimpleJsonEncoder.java b/src/main/java/de/siegmar/logbackgelf/SimpleJsonEncoder.java
@@ -140,7 +140,7 @@ private void escapeString(final String str) throws IOException {
                     writer.write("\\n");
                     break;
                 case '\r':
-                    writer.write("\\r");
+                    // Graylog doesn't like carriage-return: https://github.com/Graylog2/graylog2-server/issues/4470
                     break;
                 case '\t':
                     writer.write("\\t");

diff --git a/src/test/java/de/siegmar/logbackgelf/SimpleJsonEncoderTest.java b/src/test/java/de/siegmar/logbackgelf/SimpleJsonEncoderTest.java
@@ -93,8 +93,8 @@ public void newline() throws IOException {
 
     @Test
     public void carriageReturn() throws IOException {
-        enc.appendToJSON("aaa", "\r").close();
-        assertEquals("{\"aaa\":\"\\r\"}", writer.toString());
+        enc.appendToJSON("aaa", "\r\n").close();
+        assertEquals("{\"aaa\":\"\\n\"}", writer.toString());
     }
 
     @Test