From d040bb72d374776ba3f753078dca833c6c380fd5 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 6 Nov 2014 20:50:59 -0800
Subject: [PATCH] Restore logback base.xml behavior

Update the base.xml logback configuration file so that it behaves in
the same way as Spring Boot 1.1.

Fixes gh-1845
---
 .../logback/DefaultLogbackConfiguration.java  |  4 +--
 .../boot/logging/logback/base.xml             | 36 +++++--------------
 .../boot/logging/logback/defaults.xml         | 35 ++++++++++++++++++
 3 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml

diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
index 7f4f31f3c5..377b758410 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -32,8 +32,8 @@ import ch.qos.logback.core.util.OptionHelper;
 
 /**
  * Default logback configuration used by Spring Boot. Uses {@link LogbackConfigurator} to
- * improve startup time. See also the {@code base.xml}, {@code console-appender.xml} and
- * {@code file-appender.xml} files provided for classic {@code logback.xml} use.
+ * improve startup time. See also the {@code defaults.xml}, {@code console-appender.xml}
+ * and {@code file-appender.xml} files provided for classic {@code logback.xml} use.
  *
  * @author Phillip Webb
  * @since 1.1.2
diff --git a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
index 047abff088..0ba7cad843 100644
--- a/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
@@ -1,35 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-Base logback configuration provided for import, equivalent to the programmatic
-initialization performed by Boot
+Base logback configuration provided for compatibility with Spring Boot 1.1
 -->
 
 <included>
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-
-	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t{14}]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex"/>
-	<property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
-
-	<appender name="DEBUG_LEVEL_REMAPPER" class="org.springframework.boot.logging.logback.LevelRemappingAppender">
-		<destinationLogger>org.springframework.boot</destinationLogger>
-	</appender>
-
-	<logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-	<logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
-	<logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
-	<logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
-	<logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
-	<logger name="org.crsh.plugin" level="WARN"/>
-	<logger name="org.crsh.ssh" level="WARN"/>
-	<logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
-	<logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
-	<logger name="org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration" level="WARN"/>
-	<logger name="org.springframework.boot.actuate.endpoint.jmx" additivity="false">
-		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
-	</logger>
-	<logger name="org.thymeleaf" additivity="false">
-		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
-	</logger>
+	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
+	<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+	<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="FILE" />
+	</root>
 </included>
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
new file mode 100644
index 0000000000..b99ee86987
--- /dev/null
+++ b/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Default logback configuration provided for import, equivalent to the programmatic
+initialization performed by Boot
+-->
+
+<included>
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+
+	<property name="CONSOLE_LOG_PATTERN" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t{14}]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex"/>
+	<property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
+
+	<appender name="DEBUG_LEVEL_REMAPPER" class="org.springframework.boot.logging.logback.LevelRemappingAppender">
+		<destinationLogger>org.springframework.boot</destinationLogger>
+	</appender>
+
+	<logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
+	<logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
+	<logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
+	<logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
+	<logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
+	<logger name="org.crsh.plugin" level="WARN"/>
+	<logger name="org.crsh.ssh" level="WARN"/>
+	<logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
+	<logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
+	<logger name="org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration" level="WARN"/>
+	<logger name="org.springframework.boot.actuate.endpoint.jmx" additivity="false">
+		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
+	</logger>
+	<logger name="org.thymeleaf" additivity="false">
+		<appender-ref ref="DEBUG_LEVEL_REMAPPER"/>
+	</logger>
+</included>