Improved logging (output structure/coloring)

autumoswitzerland · Dec 23, 2023 · 214b0f3 · 214b0f3
1 parent 80ca216
commit 214b0f3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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...");