You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/11/28 17:16:17 UTC
[34/46] logging-log4j2 git commit: LOG4J2-435 added integration test
for IfAccumulatedFileCount combined with IfFileName
LOG4J2-435 added integration test for IfAccumulatedFileCount combined
with IfFileName
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f4698bb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f4698bb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f4698bb
Branch: refs/heads/master
Commit: 1f4698bbc7fe0cf2de2d4c58e9142ca97d751a6e
Parents: ba14841
Author: rpopma <rp...@apache.org>
Authored: Fri Nov 27 15:09:05 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Nov 27 15:09:05 2015 +0900
----------------------------------------------------------------------
...lingAppenderDeleteAccumulatedCount1Test.java | 119 +++++++++++++++++++
...lingAppenderDeleteAccumulatedCount2Test.java | 119 +++++++++++++++++++
...-rolling-with-custom-delete-accum-count1.xml | 49 ++++++++
...-rolling-with-custom-delete-accum-count2.xml | 49 ++++++++
4 files changed, 336 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4698bb/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java
new file mode 100644
index 0000000..1326003
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java
@@ -0,0 +1,119 @@
+/*
+ * 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.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.util.datetime.FixedDateFormat;
+import org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedFormat;
+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 RollingAppenderDeleteAccumulatedCount1Test {
+ private static final String CONFIG = "log4j-rolling-with-custom-delete-accum-count1.xml";
+ private static final String DIR = "target/rolling-with-delete-accum-count1/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 {
+ Path p1 = writeTextTo(DIR + "/my-1.log"); // glob="**/test-4.log"
+ Path p2 = writeTextTo(DIR + "/my-2.log");
+ Path p3 = writeTextTo(DIR + "/my-3.log");
+ Path p4 = writeTextTo(DIR + "/my-4.log");
+ Path p5 = writeTextTo(DIR + "/my-5.log");
+
+ final Logger logger = ctx.getLogger();
+ for (int i = 0; i < 10; ++i) {
+ updateLastModified(p1, p2, p3, p4, p5); // make my-*.log files most recent
+
+ // 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();
+ for (File file : files) {
+ System.out.println(file + " (" + file.length() + "B) "
+ + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified()));
+ }
+ List<String> expected = Arrays.asList("test-5.log", "test-6.log", "test-7.log", "test-8.log", "test-9.log", "test-10.log",
+ "my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log");
+ assertEquals(Arrays.toString(files), expected.size(), files.length);
+ for (File file : files) {
+ assertTrue("unexpected file " + file, expected.contains(file.getName()));
+ }
+ }
+
+ private void updateLastModified(Path... paths) throws IOException {
+ for (Path path : paths) {
+ Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis() + 100));
+ }
+ }
+
+ private Path writeTextTo(String location) throws IOException {
+ Path path = Paths.get(location);
+ Files.createDirectories(path.getParent());
+ try (BufferedWriter buffy = Files.newBufferedWriter(path, Charset.defaultCharset())) {
+ buffy.write("some text");
+ buffy.newLine();
+ buffy.flush();
+ }
+ return path;
+ }
+
+ 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();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4698bb/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java
new file mode 100644
index 0000000..7a75930
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java
@@ -0,0 +1,119 @@
+/*
+ * 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.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.util.datetime.FixedDateFormat;
+import org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedFormat;
+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 RollingAppenderDeleteAccumulatedCount2Test {
+ private static final String CONFIG = "log4j-rolling-with-custom-delete-accum-count2.xml";
+ private static final String DIR = "target/rolling-with-delete-accum-count2/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 {
+ Path p1 = writeTextTo(DIR + "/my-1.log"); // glob="**/test-4.log"
+ Path p2 = writeTextTo(DIR + "/my-2.log");
+ Path p3 = writeTextTo(DIR + "/my-3.log");
+ Path p4 = writeTextTo(DIR + "/my-4.log");
+ Path p5 = writeTextTo(DIR + "/my-5.log");
+
+ final Logger logger = ctx.getLogger();
+ for (int i = 0; i < 10; ++i) {
+ updateLastModified(p1, p2, p3, p4, p5); // make my-*.log files most recent
+
+ // 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();
+ for (File file : files) {
+ System.out.println(file + " (" + file.length() + "B) "
+ + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified()));
+ }
+ List<String> expected = Arrays.asList("test-10.log",
+ "my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log");
+ assertEquals(Arrays.toString(files), expected.size(), files.length);
+ for (File file : files) {
+ assertTrue("unexpected file " + file, expected.contains(file.getName()));
+ }
+ }
+
+ private void updateLastModified(Path... paths) throws IOException {
+ for (Path path : paths) {
+ Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis() + 100));
+ }
+ }
+
+ private Path writeTextTo(String location) throws IOException {
+ Path path = Paths.get(location);
+ Files.createDirectories(path.getParent());
+ try (BufferedWriter buffy = Files.newBufferedWriter(path, Charset.defaultCharset())) {
+ buffy.write("some text");
+ buffy.newLine();
+ buffy.flush();
+ }
+ return path;
+ }
+
+ 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();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4698bb/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count1.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count1.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count1.xml
new file mode 100644
index 0000000..fd9f4a2
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count1.xml
@@ -0,0 +1,49 @@
+<?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="RollingWithCustomDeleteAccumulatedSizeTest">
+ <Properties>
+ <Property name="base">target/rolling-with-delete-accum-count1/</Property>
+ </Properties>
+
+ <Appenders>
+ <RollingFile name="RollingFile" fileName="${base}/rollingtest.log"
+ filePattern="${base}/test/test-%i.log">
+ <PatternLayout>
+ <Pattern>%d %p %c{1.} [%t] %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="50" />
+ </Policies>
+ <DefaultRolloverStrategy max="100" stopCustomActionsOnError="true">
+ <Delete basePath="${base}/test">
+ <!-- delete only test-*.logs, keep the 6 most recent ones -->
+ <IfFileName glob="test-*.log" /> <!-- count not incremented if name does not match -->
+ <IfAccumulatedFileCount exceeds="6" />
+ </Delete>
+ </DefaultRolloverStrategy>
+ </RollingFile>
+ </Appenders>
+
+ <Loggers>
+ <Root level="trace">
+ <AppenderRef ref="RollingFile" />
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4698bb/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count2.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count2.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count2.xml
new file mode 100644
index 0000000..5cc6711
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count2.xml
@@ -0,0 +1,49 @@
+<?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="RollingWithCustomDeleteAccumulatedSizeTest">
+ <Properties>
+ <Property name="base">target/rolling-with-delete-accum-count2/</Property>
+ </Properties>
+
+ <Appenders>
+ <RollingFile name="RollingFile" fileName="${base}/rollingtest.log"
+ filePattern="${base}/test/test-%i.log">
+ <PatternLayout>
+ <Pattern>%d %p %c{1.} [%t] %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="50" />
+ </Policies>
+ <DefaultRolloverStrategy max="100" stopCustomActionsOnError="true">
+ <Delete basePath="${base}/test">
+ <!-- keep the 6 most recent files, after that delete the remaining test-*.log files -->
+ <IfAccumulatedFileCount exceeds="6" /><!-- count incremented regardless of name -->
+ <IfFileName glob="test-*.log" />
+ </Delete>
+ </DefaultRolloverStrategy>
+ </RollingFile>
+ </Appenders>
+
+ <Loggers>
+ <Root level="trace">
+ <AppenderRef ref="RollingFile" />
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file