louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #620 from Adrian-Devries/fix-logback

Browse Source 
Fix logback config
This commit is contained in:
Jochen Staerk
2025-01-10 11:10:47 +01:00
committed by GitHub
parent bc4588315b 3e68267f2c
commit 2da65b4ee2
3 changed files with 98 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Mustang-CLI/src/main/resources/logback.xml
View File

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

70
library/src/main/resources/logback.xml
View File

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

55
validator/src/main/resources/logback.xml
View File

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