From 5b386b6af153d24689c584dd3090c3c67d449175 Mon Sep 17 00:00:00 2001
From: Adrian-Devries <Adrian-Devries@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:40:55 +0100
Subject: [PATCH 1/3] fix logback config

fix logback config (cf. https://logback.qos.ch/codes.html#nested_if_element)
---
 library/src/main/resources/logback.xml | 70 ++++++++++++++------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/library/src/main/resources/logback.xml b/library/src/main/resources/logback.xml
index 011cab8b..7c5e39d4 100644
--- a/library/src/main/resources/logback.xml
+++ b/library/src/main/resources/logback.xml
@@ -1,33 +1,37 @@
-<configuration>
-
-    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.err</target>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
-        <then>
-            <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                    <!-- Daily rollover -->
-                    <fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
-
-                    <!-- Keep 5 years worth of history -->
-                    <maxHistory>60</maxHistory>
-                </rollingPolicy>
-
-                <encoder>
-                    <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-                </encoder>
-            </appender>
-        </then>
-    </if>
-
-    <!-- Configure so that it outputs to both console and log file -->
-    <root level="INFO">
-        <appender-ref ref="FILE"/>
-        <appender-ref ref="STDERR"/>
-    </root>
-</configuration>   
+<configuration>
+	<appender name="STDERR"
+	          class="ch.qos.logback.core.ConsoleAppender">
+		<target>System.err</target>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+	<if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
+		<then>
+			<appender name="FILE"
+			          class="ch.qos.logback.core.rolling.RollingFileAppender">
+				<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+					<!-- Daily rollover -->
+					<fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
+					<!-- Keep 5 years worth of history -->
+					<maxHistory>60</maxHistory>
+				</rollingPolicy>
+				<encoder>
+					<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+				</encoder>
+			</appender>
+		</then>
+	</if>
+	<!-- Configure so that it outputs to both console and log file -->
+	<if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
+		<then>
+			<root level="INFO">
+				<appender-ref ref="FILE"/>
+			</root>
+		</then>
+	</if>
+	<root level="INFO">
+		<appender-ref ref="STDERR"/>
+	</root>
+</configuration>   
+ 
\ No newline at end of file

From 1e57af5a6f6d79e40414b36d54fc07199370df0c Mon Sep 17 00:00:00 2001
From: Adrian-Devries <Adrian-Devries@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:41:49 +0100
Subject: [PATCH 2/3] fix logback config

fix logback config (cf. https://logback.qos.ch/codes.html#nested_if_element)
---
 validator/src/main/resources/logback.xml | 55 +++++++++++-------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/validator/src/main/resources/logback.xml b/validator/src/main/resources/logback.xml
index aed3e946..f48d8621 100644
--- a/validator/src/main/resources/logback.xml
+++ b/validator/src/main/resources/logback.xml
@@ -1,30 +1,25 @@
-<configuration>                                                                                                                                                                                                                               
-                                                                                                                                                                                                                                              
-  <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
-    <target>System.err</target>
-    <encoder>                                                                                                                                                                                                                                 
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>                                                                                                                                                                                                                                
-  </appender>                                                                                                                                                                                                                                 
-                                                                                                                                                                                                                                              
-                                                                                                                                                                                                                                              
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">                                                                                                                                                              
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">                                                                                                                                                                
-      <!-- Daily rollover -->                                                                                                                                                                                                                 
-      <fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>                                                                                                                                                                     
-                                                                                                                                                                                                                                              
-      <!-- Keep 5 years worth of history -->                                                                                                                                                                                                  
-      <maxHistory>60</maxHistory>                                                                                                                                                                                                              
-    </rollingPolicy>                                                                                                                                                                                                                          
-                                                                                                                                                                                                                                              
-    <encoder>                                                                                                                                                                                                                                 
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>                                                                                                                                                             
-    </encoder>                                                                                                                                                                                                                                
-  </appender>                                                                                                                                                                                                                                 
-                                                                                                                                                                                                                                              
-  <!-- Configure so that it outputs to both console and log file -->                                                                                                                                                                          
-  <root level="INFO">                                                                                                                                                                                                                        
-    <appender-ref ref="FILE" />                                                                                                                                                                                                               
-    <!--  appender-ref ref="STDERR" /-->
-  </root>                                                                                                                                                                                                                                     
-</configuration>   
+<configuration>
+	<appender name="STDERR"
+	          class="ch.qos.logback.core.ConsoleAppender">
+		<target>System.err</target>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+	<appender name="FILE"
+	          class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- Daily rollover -->
+			<fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
+			<!-- Keep 5 years worth of history -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+	<!-- Configure so that it outputs to both console and log file -->
+	<root level="INFO">
+		<appender-ref ref="FILE"/>
+	</root>
+</configuration>   

From 1ccfa39daed10c05e94466f1b56f79404f8f26fd Mon Sep 17 00:00:00 2001
From: Adrian-Devries <Adrian-Devries@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:42:54 +0100
Subject: [PATCH 3/3] fix logback config

fix logback config (cf. https://logback.qos.ch/codes.html#nested_if_element)
---
 Mustang-CLI/src/main/resources/logback.xml | 74 +++++++++++-----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/Mustang-CLI/src/main/resources/logback.xml b/Mustang-CLI/src/main/resources/logback.xml
index d8c56d7e..9efdfd4c 100644
--- a/Mustang-CLI/src/main/resources/logback.xml
+++ b/Mustang-CLI/src/main/resources/logback.xml
@@ -1,38 +1,36 @@
-<configuration>
-
-    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.err</target>
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
-        <then>
-            <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender" >
-                <!--<appender name="FILE" class="org.mustangproject.commandline.LazyRollingFileAppender" >-->
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                    <!-- Daily rollover -->
-                    <fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
-
-                    <!-- Keep 5 years worth of history -->
-                    <maxHistory>60</maxHistory>
-                </rollingPolicy>
-
-                <encoder>
-                    <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-                </encoder>
-            </appender>
-        </then>
-    </if>
-
-    <!-- Configure so that it outputs to both console and log file -->
-    <root level="INFO">
-        <if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
-            <then>
-                <appender-ref ref="FILE" />
-            </then>
-        </if>
-        <appender-ref ref="STDERR" />
-    </root>
-</configuration>   
+<configuration>
+	<appender name="STDERR"
+	          class="ch.qos.logback.core.ConsoleAppender">
+		<target>System.err</target>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+		</encoder>
+	</appender>
+	<if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
+		<then>
+			<appender name="FILE"
+			          class="ch.qos.logback.core.rolling.RollingFileAppender">
+				<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+					<!-- Daily rollover -->
+					<fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
+					<!-- Keep 5 years worth of history -->
+					<maxHistory>60</maxHistory>
+				</rollingPolicy>
+				<encoder>
+					<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+				</encoder>
+			</appender>
+		</then>
+	</if>
+	<!-- Configure so that it outputs to both console and log file -->
+	<if condition='property("FILE_APPENDER_ENABLED").contains("true")'>
+		<then>
+			<root level="INFO">
+				<appender-ref ref="FILE"/>
+			</root>
+		</then>
+	</if>
+	<root level="INFO">
+		<appender-ref ref="STDERR"/>
+	</root>
+</configuration>