diff --git a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml index 70af71b4518..b1f5faa8657 100644 --- a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml +++ b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml @@ -10,7 +10,7 @@ initialization performed by Boot - + org.springframework.boot diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java index 5054a7194b0..b92c37dd234 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java @@ -24,6 +24,7 @@ import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.encoder.Encoder; import ch.qos.logback.core.joran.spi.JoranException; import org.junit.Test; @@ -52,4 +53,18 @@ public class LogbackConfigurationTests { assertThat(((PatternLayoutEncoder) encoder).getPattern()).isEqualTo("foo"); } + @Test + public void filePatternCanBeOverridden() throws JoranException { + JoranConfigurator configurator = new JoranConfigurator(); + LoggerContext context = new LoggerContext(); + configurator.setContext(context); + configurator + .doConfigure(new File("src/test/resources/custom-file-log-pattern.xml")); + Appender appender = context.getLogger("ROOT").getAppender("FILE"); + assertThat(appender).isInstanceOf(FileAppender.class); + Encoder encoder = ((FileAppender) appender).getEncoder(); + assertThat(encoder).isInstanceOf(PatternLayoutEncoder.class); + assertThat(((PatternLayoutEncoder) encoder).getPattern()).isEqualTo("bar"); + } + } diff --git a/spring-boot/src/test/resources/custom-file-log-pattern.xml b/spring-boot/src/test/resources/custom-file-log-pattern.xml new file mode 100644 index 00000000000..b94a60abfdf --- /dev/null +++ b/spring-boot/src/test/resources/custom-file-log-pattern.xml @@ -0,0 +1,4 @@ + + + +