(logging-log4j2) branch main updated: Add more logging to rollover test

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new 3d134a9f86 Add more logging to rollover test
3d134a9f86 is described below

commit 3d134a9f863b9de12ab7eb87e70ea71c49ca5afb
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Thu Jul 4 11:03:00 2024 +0200

    Add more logging to rollover test
---
 .../rolling/RollingAppenderDirectCronTest.java     | 37 +++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCronTest.java
 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCronTest.java
index e897ccfc1e..6751d3cb1f 100644
--- 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCronTest.java
+++ 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCronTest.java
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.RollingFileAppender;
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.apache.logging.log4j.core.test.junit.Named;
+import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.test.junit.TempLoggingDir;
 import org.apache.logging.log4j.test.junit.UsingStatusListener;
 import org.junit.jupiter.api.Test;
@@ -67,7 +68,9 @@ class RollingAppenderDirectCronTest {
     }
 
     private static class RolloverDelay implements RolloverListener {
+        private final Logger logger = StatusLogger.getLogger();
         private volatile CountDownLatch latch;
+        private volatile AssertionError assertion;
 
         public RolloverDelay(final RollingFileManager manager) {
             latch = new CountDownLatch(1);
@@ -75,7 +78,12 @@ class RollingAppenderDirectCronTest {
         }
 
         public void waitForRollover() {
-            waitAtMost(3, TimeUnit.SECONDS).until(() -> latch.getCount() == 0);
+            waitAtMost(5, TimeUnit.SECONDS)
+                    .alias("Rollover timeout")
+                    .until(() -> latch.getCount() == 0 || assertion != null);
+            if (assertion != null) {
+                throw assertion;
+            }
         }
 
         public void reset(final int count) {
@@ -83,21 +91,28 @@ class RollingAppenderDirectCronTest {
         }
 
         @Override
-        public void rolloverTriggered(final String fileName) {}
+        public void rolloverTriggered(final String fileName) {
+            logger.info("Rollover triggered for file {}.", fileName);
+        }
 
         @Override
         public void rolloverComplete(final String fileName) {
-            final Path path = Paths.get(fileName);
-            final Matcher matcher = 
FILE_PATTERN.matcher(path.getFileName().toString());
-            assertThat(matcher).as("Rolled file").matches();
+            logger.info("Rollover completed for file {}.", fileName);
             try {
-                final List<String> lines = Files.readAllLines(path);
-                assertThat(lines).isNotEmpty();
-                assertThat(lines.get(0)).startsWith(matcher.group(1));
-            } catch (final IOException ex) {
-                fail("Unable to read file " + fileName + ": " + 
ex.getMessage());
+                final Path path = Paths.get(fileName);
+                final Matcher matcher = 
FILE_PATTERN.matcher(path.getFileName().toString());
+                assertThat(matcher).as("Rolled file").matches();
+                try {
+                    final List<String> lines = Files.readAllLines(path);
+                    assertThat(lines).isNotEmpty();
+                    assertThat(lines.get(0)).startsWith(matcher.group(1));
+                } catch (final IOException ex) {
+                    fail("Unable to read file " + fileName + ": " + 
ex.getMessage());
+                }
+                latch.countDown();
+            } catch (final AssertionError ex) {
+                assertion = ex;
             }
-            latch.countDown();
         }
     }
 }