~jan0sch/smederee: Logging: Switch to async-console and do some cleanup

~jan0sch/smederee

Showing details for patch e6ad6d9782d75ff378a5d5e42ceafc4a7ff38be0.

2022-09-15 (Thu), 1:19 PM - Jens Grassel - e6ad6d9782d75ff378a5d5e42ceafc4a7ff38be0

Logging: Switch to async-console and do some cleanup

- also properties for loglevel are introduced

Summary of changes

8 files modified with 32 lines added and 35 lines removed

modules/darcs/src/it/resources/logback-test.xml with 3 added and 3 removed lines
modules/darcs/src/main/resources/logback.xml with 4 added and 7 removed lines
modules/darcs/src/test/resources/logback-test.xml with 3 added and 3 removed lines
modules/hub/src/it/resources/logback-test.xml with 3 added and 3 removed lines
modules/hub/src/main/resources/logback.xml with 8 added and 7 removed lines
modules/hub/src/test/resources/logback-test.xml with 3 added and 3 removed lines
modules/hub/src/universal/conf/logback.xml with 6 added and 7 removed lines
modules/i18n/src/test/resources/logback-test.xml with 2 added and 2 removed lines

diff -rN -u old-smederee/modules/darcs/src/it/resources/logback-test.xml new-smederee/modules/darcs/src/it/resources/logback-test.xml
--- old-smederee/modules/darcs/src/it/resources/logback-test.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/darcs/src/it/resources/logback-test.xml	2025-02-02 10:01:05.613826402 +0000
@@ -15,11 +15,11 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.darcs" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.darcs" level="DEBUG" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
   <root>
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/darcs/src/main/resources/logback.xml new-smederee/modules/darcs/src/main/resources/logback.xml
--- old-smederee/modules/darcs/src/main/resources/logback.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/darcs/src/main/resources/logback.xml	2025-02-02 10:01:05.613826402 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
     <encoder>
       <pattern>%date %highlight(%-5level) %cyan(%logger{0}) - %msg%n</pattern>
     </encoder>
@@ -15,11 +12,11 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.darcs" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.darcs" level="${smederee.darcs.loglevel:-INFO}" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
-  <root>
-    <appender-ref ref="console"/>
+  <root level="INFO">
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/darcs/src/test/resources/logback-test.xml new-smederee/modules/darcs/src/test/resources/logback-test.xml
--- old-smederee/modules/darcs/src/test/resources/logback-test.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/darcs/src/test/resources/logback-test.xml	2025-02-02 10:01:05.613826402 +0000
@@ -15,11 +15,11 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.darcs" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.darcs" level="DEBUG" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
   <root>
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/hub/src/it/resources/logback-test.xml new-smederee/modules/hub/src/it/resources/logback-test.xml
--- old-smederee/modules/hub/src/it/resources/logback-test.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/hub/src/it/resources/logback-test.xml	2025-02-02 10:01:05.613826402 +0000
@@ -15,11 +15,11 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.hub" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.hub" level="DEBUG" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
   <root>
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/hub/src/main/resources/logback.xml new-smederee/modules/hub/src/main/resources/logback.xml
--- old-smederee/modules/hub/src/main/resources/logback.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/hub/src/main/resources/logback.xml	2025-02-02 10:01:05.613826402 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
     <encoder>
       <pattern>%date %highlight(%-5level) %cyan(%logger{0}) - %msg%n</pattern>
     </encoder>
@@ -15,11 +12,15 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.hub" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.ssh" level="${smederee.ssh.loglevel:-INFO}" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
-  <root>
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.hub" level="${smederee.hub.loglevel:-INFO}" additivity="false">
+    <appender-ref ref="async-console"/>
+  </logger>
+
+  <root level="INFO">
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/hub/src/test/resources/logback-test.xml new-smederee/modules/hub/src/test/resources/logback-test.xml
--- old-smederee/modules/hub/src/test/resources/logback-test.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/hub/src/test/resources/logback-test.xml	2025-02-02 10:01:05.613826402 +0000
@@ -15,11 +15,11 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.hub" level="INFO" additivity="false">
-    <appender-ref ref="console"/>
+  <logger name="de.smederee.hub" level="DEBUG" additivity="false">
+    <appender-ref ref="async-console"/>
   </logger>
 
   <root>
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>
diff -rN -u old-smederee/modules/hub/src/universal/conf/logback.xml new-smederee/modules/hub/src/universal/conf/logback.xml
--- old-smederee/modules/hub/src/universal/conf/logback.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/hub/src/universal/conf/logback.xml	2025-02-02 10:01:05.613826402 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
     <encoder>
       <pattern>%date %highlight(%-5level) %cyan(%logger{0}) - %msg%n</pattern>
     </encoder>
@@ -19,9 +16,6 @@
     </discriminator>
     <sift>
       <appender name="file-${runId}" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-          <level>INFO</level>
-        </filter>
         <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
         <file>logs/${runId}.log</file>
         <encoder>
@@ -55,7 +49,12 @@
     <discardingThreshold>0</discardingThreshold>
   </appender>
 
-  <logger name="de.smederee.hub" level="WARN" additivity="false">
+  <logger name="de.smederee.hub" level="${smederee.hub.loglevel:-WARN}" additivity="false">
+    <appender-ref ref="async-console"/>
+    <appender-ref ref="async-file"/>
+  </logger>
+
+  <logger name="de.smederee.ssh" level="${smederee.ssh.loglevel:-INFO}" additivity="false">
     <appender-ref ref="async-console"/>
     <appender-ref ref="async-file"/>
   </logger>
diff -rN -u old-smederee/modules/i18n/src/test/resources/logback-test.xml new-smederee/modules/i18n/src/test/resources/logback-test.xml
--- old-smederee/modules/i18n/src/test/resources/logback-test.xml	2025-02-02 10:01:05.609826395 +0000
+++ new-smederee/modules/i18n/src/test/resources/logback-test.xml	2025-02-02 10:01:05.613826402 +0000
@@ -16,10 +16,10 @@
   </appender>
 
   <logger name="de.smederee.i18n" level="OFF" additivity="false">
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </logger>
 
   <root>
-    <appender-ref ref="console"/>
+    <appender-ref ref="async-console"/>
   </root>
 </configuration>