0004324: Upgrade to log4j2

JumpMind · Mar 24, 2020 · c1a1cf2 · c1a1cf2
1 parent fa7db0e
commit c1a1cf2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/AbstractCommandLauncher.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/AbstractCommandLauncher.java
@@ -61,6 +61,7 @@
 import org.jumpmind.symmetric.transport.TransportManagerFactory;
 import org.jumpmind.symmetric.util.LogSummaryAppenderUtils;
 import org.jumpmind.util.AppUtils;
+import org.jumpmind.util.SymRollingFileAppender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -249,8 +250,8 @@ protected void configureLogging(CommandLine line) throws MalformedURLException {
             LogSummaryAppenderUtils.removeAppender("ROLLING");
         } else {
             Appender appender = LogSummaryAppenderUtils.getAppender("ROLLING");
-            if (appender instanceof RollingFileAppender) {
-                RollingFileAppender fa = (RollingFileAppender) appender;
+            if (appender instanceof SymRollingFileAppender) {
+                SymRollingFileAppender fa = (SymRollingFileAppender) appender;
                 String fileName = fa.getFileName();
 
                 if (line.hasOption(OPTION_PROPERTIES_FILE)) {

diff --git a/symmetric-server/src/main/deploy/conf/log4j2-debug.xml b/symmetric-server/src/main/deploy/conf/log4j2-debug.xml
@@ -5,13 +5,13 @@
             <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
             <PatternLayout pattern="[%X{engineName}] - %c{1} - %m%n" />
         </Console>
-        <RollingFile name="ROLLING" fileName="${env:SYM_HOME:-.}/logs/symmetric.log" filePattern="${env:SYM_HOME:-.}/logs/symmetric.log.%i" createOnDemand="true">
+        <SymRollingFile name="ROLLING" fileName="${env:SYM_HOME:-.}/logs/symmetric.log" filePattern="${env:SYM_HOME:-.}/logs/symmetric.log.%i" createOnDemand="true">
             <PatternLayout pattern="%d %p [%X{engineName}] [%c{1}] [%t] %m%n" />
             <Policies>
                 <SizeBasedTriggeringPolicy size="20 MB" />
             </Policies>
             <DefaultRolloverStrategy max="3" />
-        </RollingFile>
+        </SymRollingFile>
     </Appenders>
     <Loggers>
         <Logger name="org" level="WARN" />

diff --git a/symmetric-server/src/main/deploy/conf/log4j2.xml b/symmetric-server/src/main/deploy/conf/log4j2.xml
@@ -5,13 +5,13 @@
             <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
             <PatternLayout pattern="[%X{engineName}] - %c{1} - %m%n" />
         </Console>
-        <RollingFile name="ROLLING" fileName="${env:SYM_HOME:-.}/logs/symmetric.log" filePattern="${env:SYM_HOME:-.}/logs/symmetric.log.%i" createOnDemand="true">
+        <SymRollingFile name="ROLLING" fileName="${env:SYM_HOME:-.}/logs/symmetric.log" filePattern="${env:SYM_HOME:-.}/logs/symmetric.log.%i" createOnDemand="true">
             <PatternLayout pattern="%d %p [%X{engineName}] [%c{1}] [%t] %m%n" />
             <Policies>
                 <SizeBasedTriggeringPolicy size="20 MB" />
             </Policies>
             <DefaultRolloverStrategy max="3" />
-        </RollingFile>
+        </SymRollingFile>
     </Appenders>
     <Loggers>
         <Logger name="org" level="WARN" />