LOG4J2-435 Added test to integrate the Delete action with RolloverFileAppender
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2ae1f579 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2ae1f579 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2ae1f579 Branch: refs/heads/master Commit: 2ae1f579e3389486aa05880ad9cc019eaca98fde Parents: d38dc8a Author: rpopma <[email protected]> Authored: Sun Nov 15 21:07:36 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 15 21:07:36 2015 +0900 ---------------------------------------------------------------------- .../RollingAppenderCustomDeleteActionTest.java | 101 +++++++++++++++++++ .../log4j-rolling-with-custom-delete.xml | 60 +++++++++++ 2 files changed, 161 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2ae1f579/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCustomDeleteActionTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCustomDeleteActionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCustomDeleteActionTest.java new file mode 100644 index 0000000..fab8e07 --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCustomDeleteActionTest.java @@ -0,0 +1,101 @@ +/* + * 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.junit.LoggerContextRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExternalResource; +import org.junit.rules.RuleChain; + +import static org.junit.Assert.*; + +/** + * + */ +public class RollingAppenderCustomDeleteActionTest { + + private static final String CONFIG = "log4j-rolling-with-custom-delete.xml"; + private static final String DIR = "target/rolling-with-delete/test"; + + private final LoggerContextRule ctx = new LoggerContextRule(CONFIG); + + @Rule + public RuleChain chain = RuleChain.outerRule(new ExternalResource() { + @Override + protected void before() throws Throwable { + deleteDir(); + } + }).around(ctx); + + @Test + public void testAppender() throws Exception { + final Logger logger = ctx.getLogger(); + // 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("Directory not created", dir.exists() && dir.listFiles().length > 0); + + final int MAX_TRIES = 20; + for (int i = 0; i < MAX_TRIES; i++) { + final File[] files = dir.listFiles(); + for (File file : files) { + System.out.println(file); + } + if (files.length == 3) { + for (File file : files) { + assertTrue("test-4.log.gz should have been deleted", + Arrays.asList("test-1.log.gz", "test-2.log.gz", "test-3.log.gz").contains(file.getName())); + } + return; // test succeeded + } + logger.debug("Adding additional event " + i); + Thread.sleep(100); // Allow time for rollover to complete + } + fail("No rollover files found"); + } + + private static void deleteDir() { + final File dir = new File(DIR); + if (dir.exists()) { + final File[] files = dir.listFiles(); + for (final File file : files) { + file.delete(); + } + dir.delete(); + } + } + + public static void main(String[] args) { + Pattern p = Pattern.compile("test-.?[2,4,6,8,0]\\.log\\.gz"); + for (int i = 0; i < 16; i++) { + String str = "test-" + i + ".log.gz"; + java.util.regex.Matcher m = p.matcher(str); + System.out.println(m.matches() + ": " + str); + } + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2ae1f579/log4j-core/src/test/resources/log4j-rolling-with-custom-delete.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete.xml new file mode 100644 index 0000000..cb157a3 --- /dev/null +++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete.xml @@ -0,0 +1,60 @@ +<?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="TRACE" name="RollingWithCustomDeleteTest"> + <Properties> + <Property name="base">target/rolling-with-delete/</Property> + </Properties> + + <Appenders> + <Console name="STDOUT"> + <PatternLayout pattern="%m%n" /> + </Console> + + <RollingFile name="RollingFile" fileName="${base}/rollingtest.log" + filePattern="${base}/test/test-%i.log.gz"> + <PatternLayout> + <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="50" /> + </Policies> + <DefaultRolloverStrategy stopCustomActionsOnError="true"> + <!-- custom action executed asynchronously after the rollover --> + <Delete basePath="${base}/test" maxDepth="2" followLinks="false"> + <FileNameFilter path="test-4.log.gz" /> <!-- only keep files 1, 2 and 3 --> + </Delete> + </DefaultRolloverStrategy> + </RollingFile> + <List name="List"> + <ThresholdFilter level="error" /> + </List> + </Appenders> + + <Loggers> + <Logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false"> + <AppenderRef ref="RollingFile" /> + </Logger> + > + + <Root level="error"> + <AppenderRef ref="STDOUT" /> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file
