Log/log-colors improvements.

autumoswitzerland · Nov 6, 2024 · 5b22c56 · 5b22c56
1 parent 9012939
commit 5b22c56
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 66 deletions.
diff --git a/cfg/logging-dist.xml b/cfg/logging-dist.xml
@@ -2,61 +2,47 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 3.0 - 2023 autumo GmbH
+  Version: 3.1 - 2024 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
-
 	<Properties>
 		<Property name="basePath">${sys:ROOTPATH}/log</Property>
 	</Properties>
-
 	<Appenders>
-
 		<Console name="console" target="SYSTEM_OUT">
+			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html#PatternLayout -->
 			<PatternLayout pattern="%highlight{%-5p}{TRACE=white} %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{bright_black} %style{[%-26.26t]}{magenta} %style{%-30.30c{1.1.1.*}}{cyan} %style{:}{bright_black} %.-1000m%ex%n" disableAnsi="false" />
         </Console>
-
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
-
 			<PatternLayout pattern="%-5p %d{yyyyMMdd-HH:mm:ss.SSS} [%-26.26t] %-30.30c{1.1.1.*} : %.-1000m%ex%n" />
-
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
 				<SizeBasedTriggeringPolicy size="10MB" />
 			</Policies>
-
 			<!-- Max 10 files will be created everyday -->
 			<DefaultRolloverStrategy max="10">
 				<Delete basePath="${basePath}" maxDepth="10">
 					<!-- Delete all files older than 30 days -->
 					<IfLastModified age="30d" />
 				</Delete>
 			</DefaultRolloverStrategy>
-
 		</RollingFile>
-
 		<!-- Used to show server log on the web, remove if not needed -->
 		<LogEventAppender name="logEventAppender" />
-
 	</Appenders>
-
 	<Loggers>
-
 		<Logger name="ch.autumo.beetroot" level="info" additivity="false">
 			<AppenderRef ref="console" />
 			<!-- Used to show server log on the web, remove if not needed -->
 			<AppenderRef ref="logEventAppender" />
 		</Logger>
-
 		<Root level="info" additivity="false">
 			<AppenderRef ref="console" />
 			<!-- Used to show server log on the web, remove if not needed -->
 			<AppenderRef ref="logEventAppender" />
 		</Root>
-
 	</Loggers>
-
 </Configuration>
diff --git a/cfg/logging-web-weblogic.xml b/cfg/logging-web-weblogic.xml
@@ -2,54 +2,41 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 3.0 - 2023 autumo GmbH
+  Version: 3.1 - 2024 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
-
 	<Properties>
 		<Property name="basePath">servers/${env:SERVER_NAME}/logs</Property>
 	</Properties>
-
 	<Appenders>
-
 		<Console name="console" target="SYSTEM_OUT">
+			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html#PatternLayout -->
 			<PatternLayout pattern="%highlight{%-5p}{TRACE=white} %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{bright_black} %style{[%-26.26t]}{magenta} %style{%-30.30c{1.1.1.*}}{cyan} %style{:}{bright_black} %.-1000m%ex%n" disableAnsi="false" />
         </Console>
-
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
-
 			<PatternLayout pattern="%-5p %d{yyyyMMdd-HH:mm:ss.SSS} [%-26.26t] %-30.30c{1.1.1.*} : %.-1000m%ex%n" />
-
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
 				<SizeBasedTriggeringPolicy size="10MB" />
 			</Policies>
-
 			<!-- Max 10 files will be created everyday -->
 			<DefaultRolloverStrategy max="10">
 				<Delete basePath="${basePath}" maxDepth="10">
 					<!-- Delete all files older than 30 days -->
 					<IfLastModified age="30d" />
 				</Delete>
 			</DefaultRolloverStrategy>
-
 		</RollingFile>
-
 	</Appenders>
-
 	<Loggers>
-
 		<Logger name="ch.autumo.beetroot" level="info" additivity="false">
 			<AppenderRef ref="file" />
 		</Logger>
-
 		<Root level="info" additivity="false">
 			<AppenderRef ref="file" />
 		</Root>
-
 	</Loggers>
-
 </Configuration>
diff --git a/cfg/logging-web.xml b/cfg/logging-web.xml
@@ -2,54 +2,41 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 3.0 - 2023 autumo GmbH
+  Version: 3.1 - 2024 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
-
 	<Properties>
 		<Property name="basePath">${env:CATALINA_BASE}/logs</Property>
 	</Properties>
-
 	<Appenders>
-
 		<Console name="console" target="SYSTEM_OUT">
+			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html#PatternLayout -->
 			<PatternLayout pattern="%highlight{%-5p}{TRACE=white} %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{bright_black} %style{[%-26.26t]}{magenta} %style{%-30.30c{1.1.1.*}}{cyan} %style{:}{bright_black} %.-1000m%ex%n" disableAnsi="false" />
         </Console>
-
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
-
 			<PatternLayout pattern="%-5p %d{yyyyMMdd-HH:mm:ss.SSS} [%-26.26t] %-30.30c{1.1.1.*} : %.-1000m%ex%n" />
-
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
 				<SizeBasedTriggeringPolicy size="10MB" />
 			</Policies>
-
 			<!-- Max 10 files will be created everyday -->
 			<DefaultRolloverStrategy max="10">
 				<Delete basePath="${basePath}" maxDepth="10">
 					<!-- Delete all files older than 30 days -->
 					<IfLastModified age="30d" />
 				</Delete>
 			</DefaultRolloverStrategy>
-
 		</RollingFile>
-
 	</Appenders>
-
 	<Loggers>
-
 		<Logger name="ch.autumo.beetroot" level="info" additivity="false">
 			<AppenderRef ref="console" />
 		</Logger>
-
 		<Root level="info" additivity="false">
 			<AppenderRef ref="console" />
 		</Root>
-
 	</Loggers>
-
 </Configuration>
diff --git a/cfg/logging.xml b/cfg/logging.xml
@@ -2,62 +2,47 @@
 
 <!-- 
   beetRoot logging configuration (log4j2 behind SLF4j)
-  Version: 3.0 - 2023 autumo GmbH
+  Version: 3.1 - 2024 autumo GmbH
  -->
 
 <Configuration status="error" name="BeetRootConfig">
-
 	<Properties>
 		<Property name="basePath">${sys:ROOTPATH}/log</Property>
 	</Properties>
-
 	<Appenders>
-
 		<Console name="console" target="SYSTEM_OUT">
-  			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html  -->
+			<!-- See: https://logging.apache.org/log4j/2.x/manual/layouts.html#PatternLayout -->
 			<PatternLayout pattern="%highlight{%-5p}{TRACE=white} %style{%d{yyyyMMdd-HH:mm:ss.SSS}}{bright_black} %style{[%-26.26t]}{magenta} %style{%-30.30c{1.1.1.*}}{cyan} %style{:}{bright_black} %.-1000m%ex%n" disableAnsi="false" />
         </Console>
-
 		<RollingFile name="file"
 			fileName="${basePath}/beetroot.log"
 			filePattern="${basePath}/beetroot-%d{yyyyMMdd}.log">
-
 			<PatternLayout pattern="%-5p %d{yyyyMMdd-HH:mm:ss.SSS} [%-26.26t] %-30.30c{1.1.1.*} : %.-1000m%ex%n" />
-
 			<Policies>
 				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
 				<SizeBasedTriggeringPolicy size="10MB" />
 			</Policies>
-
 			<!-- Max 10 files will be created everyday -->
 			<DefaultRolloverStrategy max="10">
 				<Delete basePath="${basePath}" maxDepth="10">
 					<!-- Delete all files older than 30 days -->
 					<IfLastModified age="30d" />
 				</Delete>
 			</DefaultRolloverStrategy>
-
 		</RollingFile>
-
 		<!-- Used to show server log on the web, remove if not needed -->
 		<LogEventAppender name="logEventAppender" />
-
 	</Appenders>
-
 	<Loggers>
-
 		<Logger name="ch.autumo.beetroot" level="info" additivity="false">
 			<AppenderRef ref="console" />
 			<!-- Used to show server log on the web, remove if not needed -->
 			<AppenderRef ref="logEventAppender" />
 		</Logger>
-
 		<Root level="info" additivity="false">
 			<AppenderRef ref="console" />
 			<!-- Used to show server log on the web, remove if not needed -->
 			<AppenderRef ref="logEventAppender" />
 		</Root>
-
 	</Loggers>
-
 </Configuration>
diff --git a/lib/repo/ch/autumo/beetroot/autumo-beetroot/3.1.2/autumo-beetroot-3.1.2.jar b/lib/repo/ch/autumo/beetroot/autumo-beetroot/3.1.2/autumo-beetroot-3.1.2.jar
diff --git a/src/main/java/ch/autumo/beetroot/utils/common/Colors.java b/src/main/java/ch/autumo/beetroot/utils/common/Colors.java
@@ -34,10 +34,12 @@
  */
 public final class Colors {
 
-	/** show ANSI colors? */
-	private static boolean showAnsiColors = false;
+	/** Show ANSI colors? */
+	private static boolean showAnsiColors = true;
 	static {
-		showAnsiColors = BeetRootConfigurationManager.getInstance().getYesOrNo("console_colors");
+		if (BeetRootConfigurationManager.isInitialized()) {
+			showAnsiColors = BeetRootConfigurationManager.getInstance().getYesOrNo("console_colors");
+		}
 	}
 
 	/**