You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2015/11/30 10:05:29 UTC
[09/50] logging-log4j2 git commit: LOG4J2-435 added integration test
for IfAccumulatedFileSize
LOG4J2-435 added integration test for IfAccumulatedFileSize
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba148419
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba148419
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba148419
Branch: refs/heads/LOG4J-1181
Commit: ba14841970a847bea933d5a404a6054429c6f0ed
Parents: 10dbc5e
Author: rpopma <rp...@apache.org>
Authored: Fri Nov 27 14:36:23 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Nov 27 14:36:23 2015 +0900
----------------------------------------------------------------------
...ollingAppenderDeleteAccumulatedSizeTest.java | 84 ++++++++++++++++++++
...4j-rolling-with-custom-delete-accum-size.xml | 48 +++++++++++
2 files changed, 132 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba148419/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java
new file mode 100644
index 0000000..922980e
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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 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 RollingAppenderDeleteAccumulatedSizeTest {
+ private static final String CONFIG = "log4j-rolling-with-custom-delete-accum-size.xml";
+ private static final String DIR = "target/rolling-with-delete-accum-size/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();
+ 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();
+ // for (File file : files) { System.out.println(file); }
+ assertEquals(Arrays.toString(files), 4, files.length);
+ long total = 0;
+ for (File file : files) {
+ assertTrue("unexpected file " + file, Arrays
+ .asList("test-7.log", "test-8.log", "test-9.log", "test-10.log").contains(file.getName()));
+ total += file.length();
+ }
+ assertTrue("accumulatedSize=" + total, total <= 500);
+ }
+
+ 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/ba148419/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-size.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-size.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-size.xml
new file mode 100644
index 0000000..49b11f8
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-size.xml
@@ -0,0 +1,48 @@
+<?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-size/</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 most recent 500 bytes, delete following files -->
+ <IfAccumulatedFileSize exceeds="500" />
+ </Delete>
+ </DefaultRolloverStrategy>
+ </RollingFile>
+ </Appenders>
+
+ <Loggers>
+ <Root level="trace">
+ <AppenderRef ref="RollingFile" />
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file