Skip to content

Commit bedb44a

Browse files
committed
Ensure non-remapped calls are still logged
Update LevelRemappingAppender to that any calls that aren't remapped are still logged. Fixes gh-1481
1 parent f46fe32 commit bedb44a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,9 @@ public class LevelRemappingAppender extends AppenderBase<ILoggingEvent> {
5252

5353
@Override
5454
protected void append(ILoggingEvent event) {
55-
Level remappedLevel = this.remapLevels.get(event.getLevel());
56-
if (remappedLevel != null) {
57-
AppendableLogger logger = getLogger(this.destinationLogger);
58-
logger.callAppenders(new RemappedLoggingEvent(event));
59-
}
55+
AppendableLogger logger = getLogger(this.destinationLogger);
56+
Level remapped = this.remapLevels.get(event.getLevel());
57+
logger.callAppenders(remapped == null ? event : new RemappedLoggingEvent(event));
6058
}
6159

6260
protected AppendableLogger getLogger(String name) {

spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ public void customRemaps() throws Exception {
8686
assertThat(this.logCaptor.getAllValues().get(1).getLevel(), equalTo(Level.WARN));
8787
}
8888

89+
@Test
90+
public void notRemapped() throws Exception {
91+
this.appender.append(mockLogEvent(Level.TRACE));
92+
verify(this.logger).callAppenders(this.logCaptor.capture());
93+
assertThat(this.logCaptor.getAllValues().get(0).getLevel(), equalTo(Level.TRACE));
94+
}
95+
8996
private ILoggingEvent mockLogEvent(Level level) {
9097
ILoggingEvent event = mock(ILoggingEvent.class);
9198
given(event.getLevel()).willReturn(level);

0 commit comments

Comments
 (0)