You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2021/03/03 03:59:18 UTC
[logging-log4j2] branch master updated: LOG4J2-2923 - Add Rollover
Listener to aid in unit test validation.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 52f07f2 LOG4J2-2923 - Add Rollover Listener to aid in unit test validation.
52f07f2 is described below
commit 52f07f207ed1c6e4ba21290a258902613123adc8
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Tue Mar 2 20:59:04 2021 -0700
LOG4J2-2923 - Add Rollover Listener to aid in unit test validation.
---
.../core/appender/rolling/RollingFileManager.java | 39 ++++++++++
.../core/appender/rolling/RolloverListener.java | 37 +++++++++
.../RollingDirectSizeTimeNewDirectoryTest.java | 89 +++++++++-------------
src/changes/changes.xml | 3 +
4 files changed, 114 insertions(+), 54 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 7950714..6d5f91e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -29,6 +29,7 @@ import java.nio.file.attribute.FileTime;
import java.util.Collection;
import java.util.Date;
import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Semaphore;
import java.util.concurrent.ThreadPoolExecutor;
@@ -70,6 +71,7 @@ public class RollingFileManager extends FileManager {
private volatile boolean initialized;
private volatile String fileName;
private final boolean directWrite;
+ private final CopyOnWriteArrayList<RolloverListener> rolloverListeners = new CopyOnWriteArrayList<>();
/* This executor pool will create a new Thread for every work async action to be performed. Using it allows
us to make sure all the Threads are completed when the Manager is stopped. */
@@ -165,6 +167,22 @@ public class RollingFileManager extends FileManager {
}
/**
+ * Add a RolloverListener.
+ * @param listener The RolloverListener.
+ */
+ public void addRolloverListener(RolloverListener listener) {
+ rolloverListeners.add(listener);
+ }
+
+ /**
+ * Remove a RolloverListener.
+ * @param listener The RolloverListener.
+ */
+ public void removeRolloverListener(RolloverListener listener) {
+ rolloverListeners.remove(listener);
+ }
+
+ /**
* Returns the name of the File being managed.
* @return The name of the File being managed.
*/
@@ -295,6 +313,17 @@ public class RollingFileManager extends FileManager {
if (!hasOutputStream() && !isCreateOnDemand() && !isDirectWrite()) {
return;
}
+ String currentFileName = fileName;
+ if (rolloverListeners.size() > 0) {
+ for (RolloverListener listener : rolloverListeners) {
+ try {
+ listener.rolloverTriggered(currentFileName);
+ } catch (Exception ex) {
+ LOGGER.warn("Rollover Listener {} failed with {}: {}", listener.getClass().getSimpleName(),
+ ex.getClass().getName(), ex.getMessage());
+ }
+ }
+ }
if (rollover(rolloverStrategy)) {
try {
size = 0;
@@ -304,6 +333,16 @@ public class RollingFileManager extends FileManager {
logError("Failed to create file after rollover", e);
}
}
+ if (rolloverListeners.size() > 0) {
+ for (RolloverListener listener : rolloverListeners) {
+ try {
+ listener.rolloverComplete(currentFileName);
+ } catch (Exception ex) {
+ LOGGER.warn("Rollover Listener {} failed with {}: {}", listener.getClass().getSimpleName(),
+ ex.getClass().getName(), ex.getMessage());
+ }
+ }
+ }
}
protected void createFileAfterRollover() throws IOException {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverListener.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverListener.java
new file mode 100644
index 0000000..de3a298
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverListener.java
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+/**
+ * Implementations of this interface that are registered with the RollingFileManager will be notified before and
+ * after a rollover occurs. This is a synchronous call so Listeners should exit the methods as fast as possible.
+ * It is recommended that they simply notify some other already active thread.
+ */
+public interface RolloverListener {
+
+ /**
+ * Called before rollover.
+ * @param fileName The name of the file rolling over.
+ */
+ void rolloverTriggered(String fileName);
+
+ /**
+ * Called after rollover.
+ * @param fileName The name of the file rolling over.
+ */
+ void rolloverComplete(String fileName);
+}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
index 9afbfa9..a6fbfd2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
@@ -16,26 +16,33 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
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 java.io.File;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
-public class RollingDirectSizeTimeNewDirectoryTest {
+/**
+ * This test attempts to validate that logging rolls when the file size exceeds 5KB or every second.
+ * When the file rolls by time it should create a new directory. When rolling by size it should
+ * create multiple files per directory.
+ */
+public class RollingDirectSizeTimeNewDirectoryTest implements RolloverListener {
private static final String CONFIG = "log4j-rolling-size-time-new-directory.xml";
// Note that the path is hardcoded in the configuration!
private static final String DIR = "target/rolling-size-time-new-directory";
+ private static final String FILESEP = System.getProperty("file.separator");
public static LoggerContextRule loggerContextRule =
LoggerContextRule.createShutdownTimeoutLoggerContextRule(CONFIG);
@@ -43,11 +50,13 @@ public class RollingDirectSizeTimeNewDirectoryTest {
@Rule
public RuleChain chain = loggerContextRule.withCleanFoldersRule(DIR);
+ private Map<String, AtomicInteger> rolloverFiles = new HashMap<>();
+
@Test
public void streamClosedError() throws Exception {
-
- final Logger logger =
- loggerContextRule.getLogger(RollingDirectSizeTimeNewDirectoryTest.class);
+ ((RollingFileAppender) loggerContextRule.getAppender("RollingFile")).getManager()
+ .addRolloverListener(this);
+ final Logger logger = loggerContextRule.getLogger(RollingDirectSizeTimeNewDirectoryTest.class);
for (int i = 0; i < 1000; i++) {
logger.info("nHq6p9kgfvWfjzDRYbZp");
@@ -57,52 +66,24 @@ public class RollingDirectSizeTimeNewDirectoryTest {
logger.info("nHq6p9kgfvWfjzDRYbZp");
}
- final File logDir = new File(DIR);
- final File[] logFolders = logDir.listFiles();
- assertNotNull(logFolders);
- Arrays.sort(logFolders);
-
- try {
-
- final int minExpectedLogFolderCount = 2;
- assertTrue(
- "was expecting at least " + minExpectedLogFolderCount + " folders, " +
- "found " + logFolders.length,
- logFolders.length >= minExpectedLogFolderCount);
-
- for (int logFolderIndex = 0; logFolderIndex < logFolders.length; ++logFolderIndex) {
+ assertTrue("A time based rollover did not occur", rolloverFiles.size() > 1);
+ int maxFiles = Collections.max(rolloverFiles.values(), Comparator.comparing(AtomicInteger::get)).get();
+ assertTrue("No size based rollovers occurred", maxFiles > 1);
+ }
- File logFolder = logFolders[logFolderIndex];
- File[] logFiles = logFolder.listFiles();
- assertTrue(
- "no files found in folder: " + logFolder,
- logFiles != null && logFiles.length > 0);
+ @Override
+ public void rolloverTriggered(String fileName) {
- final int minExpectedLogFileCount = 2;
- if (logFolderIndex > 0
- && logFolderIndex < logFolders.length - 1) {
- assertTrue(
- "was expecting at least " + minExpectedLogFileCount + " files, " +
- "found " + logFiles.length + ": " + Arrays.toString(logFiles),
- logFiles.length >= minExpectedLogFileCount);
- }
- }
+ }
- } catch (AssertionError error) {
- System.out.format("log directory (%s) contents:%n", DIR);
- final Iterator<File> fileIterator =
- FileUtils.iterateFilesAndDirs(
- logDir, TrueFileFilter.TRUE, TrueFileFilter.TRUE);
- int totalFileCount = 0;
- while (fileIterator.hasNext()) {
- totalFileCount++;
- final File file = fileIterator.next();
- System.out.format("-> %s (%d)%n", file, file.length());
- }
- System.out.format("total file count: %d%n", totalFileCount);
- throw new AssertionError("check failure", error);
+ @Override
+ public void rolloverComplete(String fileName) {
+ String[] parts = fileName.split(FILESEP);
+ if (parts.length < 4) {
+ System.err.println("Invalid or missing filename: " + fileName);
+ return;
}
-
+ AtomicInteger fileCount = rolloverFiles.computeIfAbsent(parts[2], k -> new AtomicInteger(0));
+ fileCount.incrementAndGet();
}
-
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0f19b32..f36f1df 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -227,6 +227,9 @@
</action>
</release>
<release version="2.14.1" date="2020-MM-DD" description="GA Release 2.14.1">
+ <action issue="LOG4J2-2923" dev="rgoers" type="upd">
+ Add Rollover Listener to aid in unit test validation.
+ </action>
<action issue="LOG4J2-3028" dev="ckozak" type="fix" due-to="Jakub Kozlowski">
OutputStreamManager.flushBuffer always resets the buffer, previously the buffer was not reset after an exception.
</action>