(logging-log4j2) branch 2.x updated: Remove `StatusConsoleListener` log level filtering (#2337, #2340)

[vy]

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

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


The following commit(s) were added to refs/heads/2.x by this push:
     new 28b70d1d7f Remove `StatusConsoleListener` log level filtering (#2337, 
#2340)
28b70d1d7f is described below

commit 28b70d1d7fe63417e8eaa1abe8bf992363060515
Author: panbingkun <84731...@qq.com>
AuthorDate: Sun Mar 3 02:40:23 2024 +0800

    Remove `StatusConsoleListener` log level filtering (#2337, #2340)
---
 .../log4j/status/StatusConsoleListenerTest.java    | 23 +++-------------------
 .../log4j/status/StatusConsoleListener.java        |  6 ++----
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
index 5fb84eb317..6ca21afefa 100644
--- 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
+++ 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
@@ -50,7 +50,7 @@ public class StatusConsoleListenerTest {
     }
 
     @Test
-    void level_and_stream_should_be_honored() throws Exception {
+    void stream_should_be_honored() throws Exception {
 
         // Create the listener.
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -58,7 +58,7 @@ public class StatusConsoleListenerTest {
         final PrintStream printStream = new PrintStream(outputStream, false, 
encoding);
         final StatusConsoleListener listener = new 
StatusConsoleListener(Level.WARN, printStream);
 
-        // First, log a message that is expected to be logged.
+        // log a message that is expected to be logged.
         final RuntimeException expectedThrowable = new 
RuntimeException("expectedThrowable");
         expectedThrowable.setStackTrace(new StackTraceElement[] {
             new StackTraceElement("expectedThrowableClass", 
"expectedThrowableMethod", "expectedThrowableFile", 1)
@@ -71,29 +71,12 @@ public class StatusConsoleListenerTest {
                 expectedThrowable,
                 null)); // as set by `StatusLogger` itself
 
-        // Second, log a message that is expected to be discarded due to its 
insufficient level.
-        final RuntimeException discardedThrowable = new 
RuntimeException("discardedThrowable");
-        discardedThrowable.setStackTrace(new StackTraceElement[] {
-            new StackTraceElement("discardedThrowableClass", 
"discardedThrowableMethod", "discardedThrowableFile", 2)
-        });
-        final Message discardedMessage = 
MESSAGE_FACTORY.newMessage("discardedMessage");
-        listener.log(new StatusData(
-                null, // since ignored by `SimpleLogger`
-                Level.INFO,
-                discardedMessage,
-                discardedThrowable,
-                null)); // as set by `StatusLogger` itself
-
         // Collect the output.
         printStream.flush();
         final String output = outputStream.toString(encoding);
 
         // Verify the output.
-        assertThat(output)
-                .contains(expectedThrowable.getMessage())
-                .contains(expectedMessage.getFormattedMessage())
-                .doesNotContain(discardedThrowable.getMessage())
-                .doesNotContain(discardedMessage.getFormattedMessage());
+        
assertThat(output).contains(expectedThrowable.getMessage()).contains(expectedMessage.getFormattedMessage());
     }
 
     @Test
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
 
b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
index 99bcd8d1a7..6261c172aa 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
@@ -134,10 +134,8 @@ public class StatusConsoleListener implements 
StatusListener {
     @Override
     public void log(final StatusData data) {
         requireNonNull(data, "data");
-        if (level.isLessSpecificThan(data.getLevel())) {
-            final String formattedStatus = data.getFormattedStatus();
-            stream.println(formattedStatus);
-        }
+        final String formattedStatus = data.getFormattedStatus();
+        stream.println(formattedStatus);
     }
 
     /**