This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d145ec8ba3f62d469aaeb6f48f5385d7fb8dde06 Author: Ralph Goers <[email protected]> AuthorDate: Wed Sep 7 08:50:14 2022 -0700 LOG4J2-2507 - Add unit test --- ...ollingAppenderDirectCustomDeleteActionTest.java | 95 ++++++++++++++++++++++ .../log4j-rolling-direct-with-custom-delete.xml | 46 +++++++++++ 2 files changed, 141 insertions(+) diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCustomDeleteActionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCustomDeleteActionTest.java new file mode 100644 index 0000000000..03a8bb6a7a --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCustomDeleteActionTest.java @@ -0,0 +1,95 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.appender.rolling; + +import java.io.File; +import java.util.Arrays; +import java.util.regex.Pattern; + +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.appender.RollingFileAppender; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.RuleChain; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +/** + * + */ +public class RollingAppenderDirectCustomDeleteActionTest implements RolloverListener { + + private static final String CONFIG = "log4j-rolling-direct-with-custom-delete.xml"; + private static final String DIR = "target/rolling-direct-with-delete/test"; + + private final LoggerContextRule loggerContextRule = LoggerContextRule.createShutdownTimeoutLoggerContextRule(CONFIG); + + @Rule + public RuleChain chain = loggerContextRule.withCleanFoldersRule(DIR); + + private boolean fileFound = false; + + @Test + public void testAppender() throws Exception { + final Logger logger = loggerContextRule.getLogger(); + RollingFileAppender app = loggerContextRule.getAppender("RollingFile"); + assertNotNull(app,"No RollingFileAppender"); + app.getManager().addRolloverListener(this); + // Trigger the rollover + for (int i = 0; i < 10; ++i) { + // 30 chars per message: each message triggers a rollover + logger.debug("This is a test message number " + i); // 30 chars: + } + Thread.sleep(100); // Allow time for rollover to complete + + final File dir = new File(DIR); + assertTrue("Dir " + DIR + " should exist", dir.exists()); + assertTrue("Dir " + DIR + " should contain files", dir.listFiles().length > 0); + + final File[] files = dir.listFiles(); + assertNotNull(files, "No fiels"); + System.out.println(files[0].getName()); + long count = Arrays.stream(files).filter((f) -> f.getName().endsWith("test-4.log")).count(); + assertTrue("Deleted file was not created", fileFound); + assertEquals("File count expected: 0, actual: " + count, 0, count); + } + + public static void main(final String[] args) { + final Pattern p = Pattern.compile("test-.?[2,4,6,8,0]\\.log\\.gz"); + for (int i = 0; i < 16; i++) { + final String str = "test-" + i + ".log.gz"; + final java.util.regex.Matcher m = p.matcher(str); + System.out.println(m.matches() + ": " + str); + } + } + + @Override + public void rolloverTriggered(String fileName) { + if (fileName.endsWith("test-4.log")) { + fileFound = true; + } + } + + @Override + public void rolloverComplete(String fileName) { + + } +} diff --git a/log4j-core/src/test/resources/log4j-rolling-direct-with-custom-delete.xml b/log4j-core/src/test/resources/log4j-rolling-direct-with-custom-delete.xml new file mode 100644 index 0000000000..083b65821c --- /dev/null +++ b/log4j-core/src/test/resources/log4j-rolling-direct-with-custom-delete.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="WARN" name="RollingWithCustomDeleteTest"> + <Properties> + <Property name="base">target/rolling-direct-with-delete/</Property> + </Properties> + + <Appenders> + <RollingFile name="RollingFile" filePattern="${base}/test/test-%i.log"> + <PatternLayout> + <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="50" /> + </Policies> + <DirectWriteRolloverStrategy maxFiles="100" stopCustomActionsOnError="true"> + <Delete basePath="${base}/test" maxDepth="2" followLinks="false"> + <IfFileName glob="test-4.log" /> <!-- only keep files 1, 2 and 3 --> + </Delete> + </DirectWriteRolloverStrategy> + </RollingFile> + </Appenders> + + <Loggers> + <Root level="trace"> + <AppenderRef ref="RollingFile" /> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file
