From 0b606e6b0568c9041bf30e986e7a3a74de13cb6d Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sun, 19 Dec 2021 22:08:58 +0100
Subject: [PATCH] Use logfmt for log lines and remove ansi color codes

---
 .../files/src/test/resources/logback-test.xml | 20 +++++++++----------
 modules/joex/src/main/resources/logback.xml   |  2 +-
 .../restserver/src/main/resources/logback.xml |  2 +-
 .../store/src/test/resources/logback-test.xml | 20 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/files/src/test/resources/logback-test.xml b/modules/files/src/test/resources/logback-test.xml
index fdc4bdf7..b1e25720 100644
--- a/modules/files/src/test/resources/logback-test.xml
+++ b/modules/files/src/test/resources/logback-test.xml
@@ -1,14 +1,14 @@
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <withJansi>true</withJansi>
 
-        <encoder>
-            <pattern>%highlight(%-5level) %cyan(%logger{15}) - %msg %n</pattern>
-        </encoder>
-    </appender>
+    <encoder>
+      <pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
+    </encoder>
+  </appender>
 
-    <logger name="docspell" level="debug" />
-    <root level="error">
-        <appender-ref ref="STDOUT" />
-    </root>
+  <logger name="docspell" level="debug" />
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
 </configuration>
diff --git a/modules/joex/src/main/resources/logback.xml b/modules/joex/src/main/resources/logback.xml
index c33ec1f7..df73c8c6 100644
--- a/modules/joex/src/main/resources/logback.xml
+++ b/modules/joex/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
     <withJansi>true</withJansi>
 
     <encoder>
-      <pattern>[%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n</pattern>
+      <pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
     </encoder>
   </appender>
 
diff --git a/modules/restserver/src/main/resources/logback.xml b/modules/restserver/src/main/resources/logback.xml
index 29d65bca..406afe6e 100644
--- a/modules/restserver/src/main/resources/logback.xml
+++ b/modules/restserver/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
     <withJansi>true</withJansi>
 
     <encoder>
-      <pattern>[%thread] %highlight(%-5level) %cyan(%logger{15}) - %msg %n</pattern>
+      <pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
     </encoder>
   </appender>
 
diff --git a/modules/store/src/test/resources/logback-test.xml b/modules/store/src/test/resources/logback-test.xml
index 6d2ef8c0..5a9588a0 100644
--- a/modules/store/src/test/resources/logback-test.xml
+++ b/modules/store/src/test/resources/logback-test.xml
@@ -1,14 +1,14 @@
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <withJansi>true</withJansi>
 
-        <encoder>
-            <pattern>%highlight(%-5level) [%t{10}] %cyan(%logger{15}) - %msg %n</pattern>
-        </encoder>
-    </appender>
+    <encoder>
+      <pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
+    </encoder>
+  </appender>
 
-    <logger name="docspell" level="warn" />
-    <root level="error">
-        <appender-ref ref="STDOUT" />
-    </root>
+  <logger name="docspell" level="warn" />
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
 </configuration>