From 214b0f3ad4047fe3e450d3d0af1f5a50f87c36c9 Mon Sep 17 00:00:00 2001
From: Michael Gasche <autumo.switzerland@gmail.com>
Date: Sat, 23 Dec 2023 23:53:35 +0100
Subject: [PATCH] Improved logging (output structure/coloring)

---
 cfg/logging-dist.xml                                    | 6 +++---
 cfg/logging-web-weblogic.xml                            | 6 +++---
 cfg/logging-web.xml                                     | 6 +++---
 cfg/logging.xml                                         | 7 ++++---
 src/main/java/ch/autumo/beetroot/server/BaseServer.java | 3 ++-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/cfg/logging-dist.xml b/cfg/logging-dist.xml
index 26bf2adc..a95d58a4 100644
--- a/cfg/logging-dist.xml
+++ b/cfg/logging-dist.xml
@@ -2,7 +2,7 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 2.0 - 2022 autumo GmbH
+  Version: 3.0 - 2023 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
@@ -14,14 +14,14 @@
 	<Appenders>
 	
 		<Console name="console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
+			<PatternLayout pattern="%highlight{%-5p} : %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{fg_#cccccc} | %style{%-26.26t}{magenta} | %style{%4L}{fg_#cccccc} : %style{%-30.30c{1.1.1.*}}{cyan} | %.-1000m%ex%n" />
         </Console>
         	
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
 			
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %level [%t] [%l] - %msg%n" />
+			<PatternLayout pattern="%-5p: %d{yyyyMMdd-HH:mm:ss.SSS} | %-26.26t | %4L : %-30.30c{1.1.1.*} | %.-1000m%ex%n"/>
 			
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
diff --git a/cfg/logging-web-weblogic.xml b/cfg/logging-web-weblogic.xml
index 9486e5e9..7f4a0d40 100644
--- a/cfg/logging-web-weblogic.xml
+++ b/cfg/logging-web-weblogic.xml
@@ -2,7 +2,7 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 2.0 - 2022 autumo GmbH
+  Version: 3.0 - 2023 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
@@ -14,14 +14,14 @@
 	<Appenders>
 	
 		<Console name="console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
+			<PatternLayout pattern="%highlight{%-5p} : %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{fg_#cccccc} | %style{%-26.26t}{magenta} | %style{%4L}{fg_#cccccc} : %style{%-30.30c{1.1.1.*}}{cyan} | %.-1000m%ex%n" />
         </Console>
         	
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
 			
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %level [%t] [%l] - %msg%n" />
+			<PatternLayout pattern="%-5p : %d{yyyyMMdd-HH:mm:ss.SSS} | %-32.32t | %4L : %-30.30c{1.1.1.*} | %.-1000m%ex%n"/>
 			
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
diff --git a/cfg/logging-web.xml b/cfg/logging-web.xml
index 55a0af8d..ad63c4a0 100644
--- a/cfg/logging-web.xml
+++ b/cfg/logging-web.xml
@@ -2,7 +2,7 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 2.0 - 2022 autumo GmbH
+  Version: 3.0 - 2023 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
@@ -14,14 +14,14 @@
 	<Appenders>
 	
 		<Console name="console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
+			<PatternLayout pattern="%highlight{%-5p} : %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{fg_#cccccc} | %style{%-26.26t}{magenta} | %style{%4L}{fg_#cccccc} : %style{%-30.30c{1.1.1.*}}{cyan} | %.-1000m%ex%n" />
         </Console>
         	
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
 			
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %level [%t] [%l] - %msg%n" />
+			<PatternLayout pattern="%-5p : %d{yyyyMMdd-HH:mm:ss.SSS} | %-26.26t | %4L : %-30.30c{1.1.1.*} | %.-1000m%ex%n"/>
 			
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
diff --git a/cfg/logging.xml b/cfg/logging.xml
index 26bf2adc..734923f6 100644
--- a/cfg/logging.xml
+++ b/cfg/logging.xml
@@ -2,7 +2,7 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 2.0 - 2022 autumo GmbH
+  Version: 3.0 - 2023 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
@@ -14,14 +14,15 @@
 	<Appenders>
 	
 		<Console name="console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
+  			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html  -->
+			<PatternLayout pattern="%highlight{%-5p} : %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{fg_#cccccc} | %style{%-26.26t}{magenta} | %style{%4L}{fg_#cccccc} : %style{%-30.30c{1.1.1.*}}{cyan} | %.-1000m%ex%n" />
         </Console>
         	
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
 			
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %level [%t] [%l] - %msg%n" />
+			<PatternLayout pattern="%-5p : %d{yyyyMMdd-HH:mm:ss.SSS} | %-26.26t | %4L : %-30.30c{1.1.1.*} | %.-1000m%ex%n"/>
 			
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
diff --git a/src/main/java/ch/autumo/beetroot/server/BaseServer.java b/src/main/java/ch/autumo/beetroot/server/BaseServer.java
index 64a47e9b..3d99fcb6 100644
--- a/src/main/java/ch/autumo/beetroot/server/BaseServer.java
+++ b/src/main/java/ch/autumo/beetroot/server/BaseServer.java
@@ -227,6 +227,8 @@ public BaseServer(String params[]) {
 		ansiServerName = Colors.cyan("["+ name +"]");
 		ansiErrServerName = Colors.red("["+ name +"]");
 		
+		Thread.currentThread().setName(this.name + "-MainThread");
+		
 		
 		//------------------------------------------------------------------------------
 		
@@ -412,7 +414,6 @@ protected void startServer() {
 		if (!start)
 			return;
 		
-		
 		LOG.info("Server starting...");
 		if (LOG.isErrorEnabled())
 			System.out.println(ansiServerName + " Server starting...");