Skip to content

Commit 28b70d1

Browse files
authored
Remove StatusConsoleListener log level filtering (#2337, #2340)
1 parent c542041 commit 28b70d1

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ void StatusData_getFormattedStatus_should_be_used() {
5050
}
5151

5252
@Test
53-
void level_and_stream_should_be_honored() throws Exception {
53+
void stream_should_be_honored() throws Exception {
5454

5555
// Create the listener.
5656
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
5757
final String encoding = "UTF-8";
5858
final PrintStream printStream = new PrintStream(outputStream, false, encoding);
5959
final StatusConsoleListener listener = new StatusConsoleListener(Level.WARN, printStream);
6060

61-
// First, log a message that is expected to be logged.
61+
// log a message that is expected to be logged.
6262
final RuntimeException expectedThrowable = new RuntimeException("expectedThrowable");
6363
expectedThrowable.setStackTrace(new StackTraceElement[] {
6464
new StackTraceElement("expectedThrowableClass", "expectedThrowableMethod", "expectedThrowableFile", 1)
@@ -71,29 +71,12 @@ void level_and_stream_should_be_honored() throws Exception {
7171
expectedThrowable,
7272
null)); // as set by `StatusLogger` itself
7373

74-
// Second, log a message that is expected to be discarded due to its insufficient level.
75-
final RuntimeException discardedThrowable = new RuntimeException("discardedThrowable");
76-
discardedThrowable.setStackTrace(new StackTraceElement[] {
77-
new StackTraceElement("discardedThrowableClass", "discardedThrowableMethod", "discardedThrowableFile", 2)
78-
});
79-
final Message discardedMessage = MESSAGE_FACTORY.newMessage("discardedMessage");
80-
listener.log(new StatusData(
81-
null, // since ignored by `SimpleLogger`
82-
Level.INFO,
83-
discardedMessage,
84-
discardedThrowable,
85-
null)); // as set by `StatusLogger` itself
86-
8774
// Collect the output.
8875
printStream.flush();
8976
final String output = outputStream.toString(encoding);
9077

9178
// Verify the output.
92-
assertThat(output)
93-
.contains(expectedThrowable.getMessage())
94-
.contains(expectedMessage.getFormattedMessage())
95-
.doesNotContain(discardedThrowable.getMessage())
96-
.doesNotContain(discardedMessage.getFormattedMessage());
79+
assertThat(output).contains(expectedThrowable.getMessage()).contains(expectedMessage.getFormattedMessage());
9780
}
9881

9982
@Test

log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,8 @@ public Level getStatusLevel() {
134134
@Override
135135
public void log(final StatusData data) {
136136
requireNonNull(data, "data");
137-
if (level.isLessSpecificThan(data.getLevel())) {
138-
final String formattedStatus = data.getFormattedStatus();
139-
stream.println(formattedStatus);
140-
}
137+
final String formattedStatus = data.getFormattedStatus();
138+
stream.println(formattedStatus);
141139
}
142140

143141
/**

0 commit comments

Comments
 (0)