This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a1902cf03d5ce209266dc2ffca950abbbdadb0b8 Author: Krzysztof Krason <[email protected]> AuthorDate: Mon Aug 21 14:11:04 2023 +0200 Updated default fileIndex for rollover strategy in log4j1 --- .../log4j/builders/appender/RollingFileAppenderBuilder.java | 1 + .../org/apache/log4j/config/Log4j1ConfigurationParser.java | 11 ++++++++--- .../apache/log4j/config/AbstractLog4j1ConfigurationTest.java | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java index 7de1e59e80..42bb0873d9 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java @@ -160,6 +160,7 @@ public class RollingFileAppenderBuilder extends AbstractBuilder implements Appen final RolloverStrategy strategy = DefaultRolloverStrategy.newBuilder() .setConfig(config) .setMax(maxBackups) + .setFileIndex("min") .build(); return AppenderWrapper.adapt(RollingFileAppender.newBuilder() .setName(name) diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java index 484ca354c4..6d10d43647 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java @@ -241,8 +241,10 @@ public class Log4j1ConfigurationParser { final ComponentBuilder<?> triggeringPolicy = builder.newComponent("Policies") .addComponent(builder.newComponent("TimeBasedTriggeringPolicy").addAttribute("modulate", true)); appenderBuilder.addComponent(triggeringPolicy); - appenderBuilder - .addComponent(builder.newComponent("DefaultRolloverStrategy").addAttribute("max", Integer.MAX_VALUE)); + appenderBuilder.addComponent(builder.newComponent("DefaultRolloverStrategy") + .addAttribute("max", Integer.MAX_VALUE) + .addAttribute("fileIndex", "min") + ); builder.add(appenderBuilder); } @@ -258,7 +260,10 @@ public class Log4j1ConfigurationParser { builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size", maxFileSizeString)); appenderBuilder.addComponent(triggeringPolicy); appenderBuilder.addComponent( - builder.newComponent("DefaultRolloverStrategy").addAttribute("max", maxBackupIndexString)); + builder.newComponent("DefaultRolloverStrategy") + .addAttribute("max", maxBackupIndexString) + .addAttribute("fileIndex", "min") + ); builder.add(appenderBuilder); } diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java index 15939a7c50..0c41bf82cd 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java @@ -195,6 +195,9 @@ public abstract class AbstractLog4j1ConfigurationTest { assertEquals(name, appender.getName()); assertTrue(appender.getClass().getName(), appender instanceof RollingFileAppender); final RollingFileAppender rfa = (RollingFileAppender) appender; + + assertTrue("defaultRolloverStrategy", rfa.getManager().getRolloverStrategy() instanceof DefaultRolloverStrategy); + assertFalse("rolloverStrategy", ((DefaultRolloverStrategy) rfa.getManager().getRolloverStrategy()).isUseMax()); assertEquals("append", false, getAppendProperty(rfa)); assertEquals("bufferSize", 1000, rfa.getManager().getBufferSize()); assertEquals("immediateFlush", false, rfa.getImmediateFlush());
