Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FOLLOWUP] Fix StatusLogger log level filtering when debug mode is enabled #2340

Merged
merged 3 commits into from
Mar 2, 2024
Merged

[FOLLOWUP] Fix StatusLogger log level filtering when debug mode is enabled #2340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0407c14
[FOLLOWUP] Fix StatusLogger log level filtering when debug mode is en…
panbingkun Mar 2, 2024
45bbf85
Revert "[FOLLOWUP] Fix StatusLogger log level filtering when debug mo…
panbingkun Mar 2, 2024
b7a2473
[FOLLOWUP] Fix StatusLogger log level filtering when debug mode is en…
panbingkun Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusConsoleListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ void StatusData_getFormattedStatus_should_be_used() {
}

@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();
final String encoding = "UTF-8";
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)
Expand All @@ -71,29 +71,12 @@ void level_and_stream_should_be_honored() throws Exception {
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
Expand Down
6 changes: 2 additions & 4 deletions log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ public Level getStatusLevel() {
@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);
}

/**
Expand Down
Loading