spring-boot-1612: make console and file output configurable

1 disable the file output unless LOG_FILE is set
2 make the console optional

fixes: gh-1612

spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java

@@ -31,11 +31,13 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 
 	private final String[] paths;
 
-	public AbstractLoggingSystem(ClassLoader classLoader, String... paths) {
+	public AbstractLoggingSystem(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
 		this.classLoader = classLoader;
-		this.paths = paths.clone();
+		this.paths = getLogFileName(fileOutput, consoleOutput);
 	}
 	
+	protected abstract String[] getLogFileName(boolean fileOutput, boolean consoleOutput);
+
 	protected final ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
@@ -59,7 +61,9 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 	}
 
 	protected void initializeWithSensibleDefaults() {
-		initialize(getPackagedConfigFile("basic-" + this.paths[this.paths.length - 1]));
+		String path = this.paths[this.paths.length - 1];
+		path = path.replaceAll("-console", "").replaceAll("-file", "");
+		initialize(getPackagedConfigFile("basic-" + path));
 	}
 
 	protected final String getPackagedConfigFile(String fileName) {

spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

@@ -75,6 +75,8 @@ public class LoggingApplicationListener implements SmartApplicationListener {
 
 	public static final String PID_KEY = "PID";
 	
+	public static final String LOG_FILE = "LOG_FILE";
+
 	static {
 		ENVIRONMENT_SYSTEM_PROPERTY_MAPPING = new HashMap<String, String>();
 		ENVIRONMENT_SYSTEM_PROPERTY_MAPPING.put("logging.file", "LOG_FILE");
@@ -131,8 +133,7 @@ public class LoggingApplicationListener implements SmartApplicationListener {
 			if (System.getProperty(PID_KEY) == null) {
 				System.setProperty(PID_KEY, new ApplicationPid().toString());
 			}
-			LoggingSystem loggingSystem = LoggingSystem.get(ClassUtils
-					.getDefaultClassLoader());
+			LoggingSystem loggingSystem = LoggingSystem.get(ClassUtils.getDefaultClassLoader(), false, false);
 			loggingSystem.beforeInitialize();
 		}
 	}
@@ -144,7 +145,13 @@ public class LoggingApplicationListener implements SmartApplicationListener {
 	protected void initialize(ConfigurableEnvironment environment, ClassLoader classLoader) {
 		initializeEarlyLoggingLevel(environment);
 		cleanLogTempProperty();
-		LoggingSystem system = LoggingSystem.get(classLoader);
+		boolean fileOutput = !StringUtils.isEmpty(environment.getProperty("logging.file"));
+		boolean consoleOutput = true;
+		if (!StringUtils.isEmpty(environment.getProperty("logging.console"))
+				&& environment.getProperty("logging.console").equalsIgnoreCase("false")) {
+			consoleOutput = false;
+		}
+		LoggingSystem system = LoggingSystem.get(classLoader, fileOutput, consoleOutput);
 		boolean systemEnvironmentChanged = mapSystemPropertiesFromSpring(environment);
 		if (systemEnvironmentChanged) {
 			// Re-initialize the defaults in case the system Environment changed

spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java

@@ -74,14 +74,14 @@ public abstract class LoggingSystem {
 	 * Detect and return the logging system in use.
 	 * @return The logging system
 	 */
-	public static LoggingSystem get(ClassLoader classLoader) {
+	public static LoggingSystem get(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
 		for (Map.Entry<String, String> entry : SYSTEMS.entrySet()) {
 			if (ClassUtils.isPresent(entry.getKey(), classLoader)) {
 				try {
 					Class<?> systemClass = ClassUtils.forName(entry.getValue(),
 							classLoader);
-					return (LoggingSystem) systemClass.getConstructor(ClassLoader.class)
-							.newInstance(classLoader);
+					return (LoggingSystem) systemClass.getConstructor(ClassLoader.class, boolean.class, boolean.class)
+							.newInstance(classLoader, fileOutput, consoleOutput);
 				}
 				catch (Exception ex) {
 					throw new IllegalStateException(ex);

spring-boot/src/main/java/org/springframework/boot/logging/Slf4JLoggingSystem.java

@@ -27,8 +27,8 @@ import org.springframework.util.ClassUtils;
  */
 public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
 
-	public Slf4JLoggingSystem(ClassLoader classLoader, String... paths) {
-		super(classLoader, paths);
+	public Slf4JLoggingSystem(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
+		super(classLoader, fileOutput, consoleOutput);
 	}
 
 	@Override

spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,10 +51,28 @@ public class JavaLoggingSystem extends AbstractLoggingSystem {
 		LEVELS = Collections.unmodifiableMap(levels);
 	}
 
-	public JavaLoggingSystem(ClassLoader classLoader) {
-		super(classLoader, "logging.properties");
+	public JavaLoggingSystem(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
+		super(classLoader, fileOutput, consoleOutput);
 	}
 	
+	@Override
+	protected String[] getLogFileName(boolean fileOutput, boolean consoleOutput) {
+		if (fileOutput && consoleOutput) {
+			return new String[] { "logging-file-console.properties" };
+		}
+		else if (fileOutput) {
+			return new String[] { "logging-file.properties" };
+		}
+		else if (consoleOutput) {
+			return new String[] { "logging-console.properties" };
+		}
+		else {
+			return new String[] { "logging.properties" };
+		}
+	}
+
+
+
 	@Override
 	public void initialize(String configLocation) {
 		Assert.notNull(configLocation, "ConfigLocation must not be null");

spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java

@@ -51,8 +51,24 @@ public class Log4JLoggingSystem extends Slf4JLoggingSystem {
 		LEVELS = Collections.unmodifiableMap(levels);
 	}
 
-	public Log4JLoggingSystem(ClassLoader classLoader) {
-		super(classLoader, "log4j.xml", "log4j.properties");
+	public Log4JLoggingSystem(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
+		super(classLoader, fileOutput, consoleOutput);
+	}
+	
+	@Override
+	protected String[] getLogFileName(boolean fileOutput, boolean consoleOutput) {
+		if (fileOutput && consoleOutput) {
+			return new String[] { "log4j-file-console.xml", "log4j-file-console.properties" };
+		}
+		else if (fileOutput) {
+			return new String[] { "log4j-file.xml", "log4j-file.properties" };
+		}
+		else if (consoleOutput) {
+			return new String[] { "log4j-console.xml", "log4j-console.properties" };
+		}
+		else {
+			return new String[] { "log4j.xml", "log4j.properties" };
+		}
 	}
 
 	@Override

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

@@ -58,9 +58,27 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
 		LEVELS = Collections.unmodifiableMap(levels);
 	}
 
-	public LogbackLoggingSystem(ClassLoader classLoader) {
-		super(classLoader, "logback-test.groovy", "logback-test.xml", "logback.groovy",
-				"logback.xml");
+	public LogbackLoggingSystem(ClassLoader classLoader, boolean fileOutput, boolean consoleOutput) {
+		super(classLoader, fileOutput, consoleOutput);
+	}
+	
+	@Override
+	protected String[] getLogFileName(boolean fileOutput, boolean consoleOutput) {
+		if (fileOutput && consoleOutput) {
+			return new String[] { "logback-test-file-console.groovy", "logback-test-file-console.xml",
+					"logback-file-console.groovy", "logback-file-console.xml" };
+		}
+		else if (fileOutput) {
+			return new String[] { "logback-test-file.groovy", "logback-test-file.xml", "logback-file.groovy",
+					"logback-file.xml" };
+		}
+		else if (consoleOutput) {
+			return new String[] { "logback-test-console.groovy", "logback-test-console.xml", "logback-console.groovy",
+					"logback-console.xml" };
+		}
+		else {
+			return new String[] { "logback-test.groovy", "logback-test.xml", "logback.groovy", "logback.xml" };
+		}
 	}
 
 	@Override

spring-boot/src/main/resources/org/springframework/boot/logging/java/logging-console.properties

@@ -0,0 +1,13 @@
+handlers =java.util.logging.ConsoleHandler
+.level = INFO
+
+java.util.logging.ConsoleHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
+java.util.logging.ConsoleHandler.level = ALL
+
+org.hibernate.validator.internal.util.Version.level = WARNING
+org.apache.coyote.http11.Http11NioProtocol.level = WARNING
+org.crsh.plugin.level = WARNING
+org.apache.tomcat.util.net.NioSelectorPool.level = WARNING
+org.apache.catalina.startup.DigesterFactory.level = SEVERE
+org.apache.catalina.util.LifecycleBase.level = SEVERE
+org.eclipse.jetty.util.component.AbstractLifeCycle.level = SEVERE

spring-boot/src/main/resources/org/springframework/boot/logging/java/logging-file-console.properties

@@ -0,0 +1,20 @@
+handlers =java.util.logging.FileHandler,java.util.logging.ConsoleHandler
+.level = INFO
+
+# File Logging
+java.util.logging.FileHandler.pattern = %t/spring.log
+java.util.logging.FileHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
+java.util.logging.FileHandler.level = ALL
+java.util.logging.FileHandler.limit = 10485760
+java.util.logging.FileHandler.count = 10
+
+java.util.logging.ConsoleHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
+java.util.logging.ConsoleHandler.level = ALL
+
+org.hibernate.validator.internal.util.Version.level = WARNING
+org.apache.coyote.http11.Http11NioProtocol.level = WARNING
+org.crsh.plugin.level = WARNING
+org.apache.tomcat.util.net.NioSelectorPool.level = WARNING
+org.apache.catalina.startup.DigesterFactory.level = SEVERE
+org.apache.catalina.util.LifecycleBase.level = SEVERE
+org.eclipse.jetty.util.component.AbstractLifeCycle.level = SEVERE

spring-boot/src/main/resources/org/springframework/boot/logging/java/logging-file.properties

@@ -0,0 +1,17 @@
+handlers =java.util.logging.FileHandler
+.level = INFO
+
+# File Logging
+java.util.logging.FileHandler.pattern = %t/spring.log
+java.util.logging.FileHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
+java.util.logging.FileHandler.level = ALL
+java.util.logging.FileHandler.limit = 10485760
+java.util.logging.FileHandler.count = 10
+
+org.hibernate.validator.internal.util.Version.level = WARNING
+org.apache.coyote.http11.Http11NioProtocol.level = WARNING
+org.crsh.plugin.level = WARNING
+org.apache.tomcat.util.net.NioSelectorPool.level = WARNING
+org.apache.catalina.startup.DigesterFactory.level = SEVERE
+org.apache.catalina.util.LifecycleBase.level = SEVERE
+org.eclipse.jetty.util.component.AbstractLifeCycle.level = SEVERE

spring-boot/src/main/resources/org/springframework/boot/logging/java/logging.properties

@@ -1,16 +1,6 @@
-handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers =
 .level = INFO
 
-# File Logging
-java.util.logging.FileHandler.pattern = %t/spring.log
-java.util.logging.FileHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
-java.util.logging.FileHandler.level = ALL
-java.util.logging.FileHandler.limit = 10485760
-java.util.logging.FileHandler.count = 10
-
-java.util.logging.ConsoleHandler.formatter = org.springframework.boot.logging.java.SimpleFormatter
-java.util.logging.ConsoleHandler.level = ALL
-
 org.hibernate.validator.internal.util.Version.level = WARNING
 org.apache.coyote.http11.Http11NioProtocol.level = WARNING
 org.crsh.plugin.level = WARNING

spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j-console.properties

@@ -0,0 +1,20 @@
+log4j.rootCategory=INFO, CONSOLE
+
+PID=????
+LOG_PATH=${java.io.tmpdir}
+LOG_FILE=${LOG_PATH}/spring.log
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
+
+
+log4j.category.org.hibernate.validator.internal.util.Version=WARN
+log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN
+log4j.category.org.crsh.plugin=WARN
+log4j.category.org.apache.tomcat.util.net.NioSelectorPool=WARN
+log4j.category.org.apache.catalina.startup.DigesterFactory=ERROR
+log4j.category.org.apache.catalina.util.LifecycleBase=ERROR
+log4j.category.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR

spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j-file-console.properties

@@ -0,0 +1,25 @@
+log4j.rootCategory=INFO, CONSOLE, FILE
+
+PID=????
+LOG_PATH=${java.io.tmpdir}
+LOG_FILE=${LOG_PATH}/spring.log
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.File=${LOG_FILE}
+log4j.appender.FILE.MaxFileSize=10MB
+log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.category.org.hibernate.validator.internal.util.Version=WARN
+log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN
+log4j.category.org.crsh.plugin=WARN
+log4j.category.org.apache.tomcat.util.net.NioSelectorPool=WARN
+log4j.category.org.apache.catalina.startup.DigesterFactory=ERROR
+log4j.category.org.apache.catalina.util.LifecycleBase=ERROR
+log4j.category.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR

spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j-file.properties

@@ -0,0 +1,20 @@
+log4j.rootCategory=INFO,FILE
+
+PID=????
+LOG_PATH=${java.io.tmpdir}
+LOG_FILE=${LOG_PATH}/spring.log
+LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.File=${LOG_FILE}
+log4j.appender.FILE.MaxFileSize=10MB
+log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
+
+log4j.category.org.hibernate.validator.internal.util.Version=WARN
+log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN
+log4j.category.org.crsh.plugin=WARN
+log4j.category.org.apache.tomcat.util.net.NioSelectorPool=WARN
+log4j.category.org.apache.catalina.startup.DigesterFactory=ERROR
+log4j.category.org.apache.catalina.util.LifecycleBase=ERROR
+log4j.category.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR

spring-boot/src/main/resources/org/springframework/boot/logging/log4j/log4j.properties

@@ -1,20 +1,10 @@
-log4j.rootCategory=INFO, CONSOLE, FILE
+log4j.rootCategory=INFO
 
 PID=????
 LOG_PATH=${java.io.tmpdir}
 LOG_FILE=${LOG_PATH}/spring.log
 LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n
 
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN}
-
-log4j.appender.FILE=org.apache.log4j.RollingFileAppender
-log4j.appender.FILE.File=${LOG_FILE}
-log4j.appender.FILE.MaxFileSize=10MB
-log4j.appender.FILE.layout = org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN}
 
 log4j.category.org.hibernate.validator.internal.util.Version=WARN
 log4j.category.org.apache.coyote.http11.Http11NioProtocol=WARN

spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/basic-log4j2.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_PATTERN">[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${sys:PID} %5p [%t] --- %c{1}: %m%n</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.crsh.plugin" level="WARN" />
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>

spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_PATH">/tmp</Property>
-        <Property name="LOG_FILE">${sys:LOG_PATH}/spring.log</Property>
-        <Property name="LOG_PATTERN">[%d{yyyy-MM-dd HH:mm:ss.SSS}] boot%X{context} - ${sys:PID} %5p [%t] --- %c{1}: %m%n</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT" follow="true">
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-        </Console>
-        <RollingFile name="File" fileName="${sys:LOG_FILE}"
-                     filePattern="logs/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
-            <PatternLayout>
-                <Pattern>${LOG_PATTERN}</Pattern>
-            </PatternLayout>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="10 MB"/>
-            </Policies>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.crsh.plugin" level="warn" />
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml

@@ -3,27 +3,8 @@
 
 	<include resource="org/springframework/boot/logging/logback/basic.xml"/>
 
-	<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
-	<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="FILE"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<encoder>
-			<pattern>${FILE_LOG_PATTERN}</pattern>
-		</encoder>
-		<file>${LOG_FILE}</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${LOG_FILE}.%i</fileNamePattern>
-		</rollingPolicy>
-		<triggeringPolicy
-			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<MaxFileSize>10MB</MaxFileSize>
-		</triggeringPolicy>
-	</appender>
 
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
-		<appender-ref ref="FILE" />
 	</root>
 
 </included>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/basic-console.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF8"?>
+<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"/>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+			<charset>utf8</charset>
+		</encoder>
+	</appender>
+	
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+ 	</root>
+</included>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/basic-file.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF8"?>
+<included>
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
+	<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="FILE"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<encoder>
+			<pattern>${FILE_LOG_PATTERN}</pattern>
+		</encoder>
+		<file>${LOG_FILE}</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${LOG_FILE}.%i</fileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<MaxFileSize>10MB</MaxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<root level="INFO">
+		<appender-ref ref="FILE" />
+ 	</root>
+</included>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/basic.xml

@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <included>
-	<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"/>
-
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-			<charset>utf-8</charset>
-		</encoder>
-	</appender>
 
 	<appender name="DEBUG_LEVEL_REMAPPER" class="org.springframework.boot.logging.logback.LevelRemappingAppender">
 	   <destinationLogger>org.springframework.boot</destinationLogger>
 	</appender>
 	
-	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
-	</root>
 
 	<logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
 	<logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback-console.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+ 	<include resource="org/springframework/boot/logging/logback/basic-console.xml"/>
+</configuration>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback-file-console.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+ 	<include resource="org/springframework/boot/logging/logback/basic-file.xml"/>
+ 	<include resource="org/springframework/boot/logging/logback/basic-console.xml"/>
+</configuration>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback-file.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+ 	<include resource="org/springframework/boot/logging/logback/basic-file.xml"/>
+</configuration>

spring-boot/src/main/resources/org/springframework/boot/logging/logback/logback.xml

@@ -1,18 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF8"?>
 <configuration>
-
-	<!--
-
-	This file is the default logback configuration for Spring Boot. To use the same
-	defaults and add custom logger levels you can copy this file and add additional
-	overrides, e.g:
-
 	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<logger name="org.springframework.web" level="DEBUG"/>
-	...
-
-    -->
-
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-
 </configuration>