From 92da7956e63d990ed971d45a34b9fa40c954667f Mon Sep 17 00:00:00 2001
From: Steven Barclay <stejbac@gmail.com>
Date: Thu, 2 May 2024 00:29:40 +0200
Subject: [PATCH] Tidy logback files & add space back to log pattern

Uniformise the log patterns somewhat, by making the 'Logger' classname
field width either 15 for the seednode & statsnode, or 40 for the other
applications (lengthened from 30 in a few cases).

Also clean up the logback XML files somewhat, in particular removing
references to the old Thali (thaliproject/Tor_Onion_Proxy_Library) Tor
library, which was replaced years ago with our own fork of NetLayer
(https://github.com/cd2357/netlayer).

Finally, add a missing space back to the log pattern for bisq-desktop,
to prevent DEBUG, ERROR or TRACE lines appearing as follows:

  ... [JavaFX Application Thread] ERRORb.c.s.CommonSetup: ...

(It isn't clear whether this recently introduced behaviour was really
intentional, though it did prevent two consecutive spaces appearing in
the majority INFO log lines.)
---
 apitest/src/main/resources/logback.xml   | 2 +-
 apitest/src/test/resources/logback.xml   | 2 +-
 cli/src/main/resources/logback.xml       | 3 +--
 daemon/src/main/resources/logback.xml    | 3 +--
 desktop/src/main/resources/logback.xml   | 7 ++++---
 seednode/src/main/resources/logback.xml  | 3 ---
 statsnode/src/main/resources/logback.xml | 3 ---
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/apitest/src/main/resources/logback.xml b/apitest/src/main/resources/logback.xml
index 28279faa118..16f6cc07eea 100644
--- a/apitest/src/main/resources/logback.xml
+++ b/apitest/src/main/resources/logback.xml
@@ -8,7 +8,7 @@
     -->
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{30}: %msg %xEx%n)</pattern>
+            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40}: %msg %xEx%n)</pattern>
         </encoder>
     </appender>
 
diff --git a/apitest/src/test/resources/logback.xml b/apitest/src/test/resources/logback.xml
index 28279faa118..16f6cc07eea 100644
--- a/apitest/src/test/resources/logback.xml
+++ b/apitest/src/test/resources/logback.xml
@@ -8,7 +8,7 @@
     -->
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{30}: %msg %xEx%n)</pattern>
+            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40}: %msg %xEx%n)</pattern>
         </encoder>
     </appender>
 
diff --git a/cli/src/main/resources/logback.xml b/cli/src/main/resources/logback.xml
index bc8edf02211..4c5638f7ac3 100644
--- a/cli/src/main/resources/logback.xml
+++ b/cli/src/main/resources/logback.xml
@@ -2,7 +2,7 @@
 <configuration>
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{30}: %msg %xEx%n)</pattern>
+            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40}: %msg %xEx%n)</pattern>
         </encoder>
     </appender>
 
@@ -11,5 +11,4 @@
     </root>
 
     <logger name="io.grpc.netty" level="WARN"/>
-
 </configuration>
diff --git a/daemon/src/main/resources/logback.xml b/daemon/src/main/resources/logback.xml
index bc8edf02211..4c5638f7ac3 100644
--- a/daemon/src/main/resources/logback.xml
+++ b/daemon/src/main/resources/logback.xml
@@ -2,7 +2,7 @@
 <configuration>
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{30}: %msg %xEx%n)</pattern>
+            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40}: %msg %xEx%n)</pattern>
         </encoder>
     </appender>
 
@@ -11,5 +11,4 @@
     </root>
 
     <logger name="io.grpc.netty" level="WARN"/>
-
 </configuration>
diff --git a/desktop/src/main/resources/logback.xml b/desktop/src/main/resources/logback.xml
index 144f2cb1281..9009673b34c 100644
--- a/desktop/src/main/resources/logback.xml
+++ b/desktop/src/main/resources/logback.xml
@@ -2,13 +2,14 @@
 <configuration>
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level%logger{40}: %msg %xEx%n)</pattern>
+            <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40}: %msg %xEx%n)</pattern>
         </encoder>
     </appender>
 
-    <!-- <logger name="org.bitcoinj" level="WARN"/>-->
-    <logger name="org.berndpruenster.netlayer.tor.Tor" level="WARN"/>
     <root level="TRACE">
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
+
+    <!-- <logger name="org.bitcoinj" level="WARN"/>-->
+    <logger name="org.berndpruenster.netlayer.tor.Tor" level="WARN"/>
 </configuration>
diff --git a/seednode/src/main/resources/logback.xml b/seednode/src/main/resources/logback.xml
index 914b9d3d4ba..45e46b31170 100644
--- a/seednode/src/main/resources/logback.xml
+++ b/seednode/src/main/resources/logback.xml
@@ -9,7 +9,4 @@
     <root level="TRACE">
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
-
-    <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="INFO"/>
-
 </configuration>
diff --git a/statsnode/src/main/resources/logback.xml b/statsnode/src/main/resources/logback.xml
index 914b9d3d4ba..45e46b31170 100644
--- a/statsnode/src/main/resources/logback.xml
+++ b/statsnode/src/main/resources/logback.xml
@@ -9,7 +9,4 @@
     <root level="TRACE">
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
-
-    <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="INFO"/>
-
 </configuration>