From ebeb5cb48bbe5f34d4a5511bbc25e1c25f9fe812 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Fri, 12 Apr 2024 23:05:48 -0500
Subject: [PATCH] Fixing logging not working for unit tests

---
 .../src/main/resources/log4j.xml              | 43 ---------------
 .../src/main/resources/log4j2.xml             | 55 +++++++++++++++++++
 2 files changed, 55 insertions(+), 43 deletions(-)
 delete mode 100644 gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
 create mode 100644 gemp-lotr/gemp-lotr-server/src/main/resources/log4j2.xml

diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
deleted file mode 100644
index 644c5a647..000000000
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- Pattern to output the caller's file name and line number -->
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-    <appender name="R" class="org.apache.log4j.RollingFileAppender">
-        <param name="file" value="logs/gemp-lotr.log"/>
-        <param name="MaxFileSize" value="10MB"/>
-        <param name="MaxBackupIndex" value="20"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="chat" class="org.apache.log4j.RollingFileAppender">
-        <param name="file" value="logs/chat.log"/>
-        <param name="MaxFileSize" value="10MB"/>
-        <!-- Keep one backup file -->
-        <param name="MaxBackupIndex" value="20"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-
-    <logger name="com.gempukku" additivity="false">
-        <level value="debug"/>
-        <appender-ref ref="R"/>
-        <appender-ref ref="stdout"/>
-    </logger>
-    <logger name="chat">
-        <level value="ALL"/>
-        <appender-ref ref="chat"/>
-    </logger>
-    <root>
-        <level value="error"/>
-        <appender-ref ref="R"/>
-        <appender-ref ref="stdout"/>
-    </root>
-</log4j:configuration>
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/log4j2.xml b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..543dc45e9
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j2.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="warn" name="MyApp">
+  <Appenders>
+    <Console name="stdout" target="SYSTEM_OUT">
+      <PatternLayout pattern="%m%n"/>
+    </Console>
+    <RollingRandomAccessFile name="mainlog" fileName="/logs/gemp-lotr.log"
+            filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+        <PatternLayout>
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n</Pattern>
+        </PatternLayout>
+        <Policies>
+            <TimeBasedTriggeringPolicy />
+            <SizeBasedTriggeringPolicy size="10 MB"/>
+        </Policies>
+        <DefaultRolloverStrategy max="20"/>
+    </RollingRandomAccessFile >
+    <RollingRandomAccessFile name="chat" fileName="/logs/chat.log"
+                 filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+        <PatternLayout>
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n</Pattern>
+        </PatternLayout>
+        <Policies>
+            <TimeBasedTriggeringPolicy />
+            <SizeBasedTriggeringPolicy size="10 MB"/>
+        </Policies>
+        <DefaultRolloverStrategy max="20"/>
+    </RollingRandomAccessFile >
+    
+    <RollingRandomAccessFile name="errorlog" fileName="/logs/error.log"
+                 filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+        <PatternLayout>
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n</Pattern>
+        </PatternLayout>
+        <Policies>
+            <TimeBasedTriggeringPolicy />
+            <SizeBasedTriggeringPolicy size="10 MB"/>
+        </Policies>
+        <DefaultRolloverStrategy max="20"/>
+        <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+    </RollingRandomAccessFile>
+  </Appenders>
+  <Loggers>
+    <Logger name="com.gempukku" level="TRACE" additivity="false">
+        <AppenderRef ref="mainlog"/>
+        <AppenderRef ref="stdout"/>
+    </Logger>
+    <Logger name="chat" level="ALL">
+        <AppenderRef ref="chat"/>
+    </Logger>
+    <Root level="ERROR">
+        <AppenderRef ref="errorlog"/>
+    </Root>
+  </Loggers>
+</Configuration>
\ No newline at end of file