root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 22 Packages Projects Releases Wiki Activity

Ensure non-remapped calls are still logged 

Update LevelRemappingAppender to that any calls that aren't remapped
are still logged.

Fixes gh-1481
This commit is contained in:
Phillip Webb 2014-09-03 11:43:28 -07:00
parent f46fe32264
commit bedb44adc8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,11 +52,9 @@ public class LevelRemappingAppender extends AppenderBase<ILoggingEvent> {
@Override @Override
protected void append(ILoggingEvent event) { protected void append(ILoggingEvent event) {
Level remappedLevel = this.remapLevels.get(event.getLevel()); AppendableLogger logger = getLogger(this.destinationLogger);
if (remappedLevel != null) { Level remapped = this.remapLevels.get(event.getLevel());
AppendableLogger logger = getLogger(this.destinationLogger); logger.callAppenders(remapped == null ? event : new RemappedLoggingEvent(event));
logger.callAppenders(new RemappedLoggingEvent(event));
}
} }
protected AppendableLogger getLogger(String name) { protected AppendableLogger getLogger(String name) {

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

@ -86,6 +86,13 @@ public class LevelRemappingAppenderTests {
assertThat(this.logCaptor.getAllValues().get(1).getLevel(), equalTo(Level.WARN)); assertThat(this.logCaptor.getAllValues().get(1).getLevel(), equalTo(Level.WARN));
} }
@Test
public void notRemapped() throws Exception {
this.appender.append(mockLogEvent(Level.TRACE));
verify(this.logger).callAppenders(this.logCaptor.capture());
assertThat(this.logCaptor.getAllValues().get(0).getLevel(), equalTo(Level.TRACE));
}
private ILoggingEvent mockLogEvent(Level level) { private ILoggingEvent mockLogEvent(Level level) {
ILoggingEvent event = mock(ILoggingEvent.class); ILoggingEvent event = mock(ILoggingEvent.class);
given(event.getLevel()).willReturn(level); given(event.getLevel()).willReturn(level);