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

Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-02-11 18:00:10 +00:00
parent f3c622ad89 ddfadce94d
commit 72928de518
4 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,31 @@ public class LoggingApplicationListener implements GenericApplicationListener {
*/
public static final String EXCEPTION_CONVERSION_WORD = "LOG_EXCEPTION_CONVERSION_WORD";
/**
* The name of the System property that contains the log file.
*/
public static final String LOG_FILE = "LOG_FILE";
/**
* The name of the System property that contains the log file.
*/
public static final String LOG_PATH = "LOG_PATH";
/**
* The name of the System property that contains the console log pattern
*/
public static final String CONSOLE_LOG_PATTERN = "CONSOLE_LOG_PATTERN";
/**
* The name of the System property that contains the file log pattern
*/
public static final String FILE_LOG_PATTERN = "FILE_LOG_PATTERN";
/**
* The name of the System property that contains the log level pattern
*/
public static final String LOG_LEVEL_PATTERN = "LOG_LEVEL_PATTERN";
/**
* The name of the {@link LoggingSystem} bean.
*/
@ -222,23 +247,38 @@ public class LoggingApplicationListener implements GenericApplicationListener {
*/
protected void initialize(ConfigurableEnvironment environment,
ClassLoader classLoader) {
if (System.getProperty(PID_KEY) == null) {
System.setProperty(PID_KEY, new ApplicationPid().toString());
}
if (System.getProperty(EXCEPTION_CONVERSION_WORD) == null) {
System.setProperty(EXCEPTION_CONVERSION_WORD,
getExceptionConversionWord(environment));
}
LogFile logFile = LogFile.get(environment);
setSystemProperties(environment, logFile);
initializeEarlyLoggingLevel(environment);
initializeSystem(environment, this.loggingSystem);
initializeSystem(environment, this.loggingSystem, logFile);
initializeFinalLoggingLevels(environment, this.loggingSystem);
registerShutdownHookIfNecessary(environment, this.loggingSystem);
}
private String getExceptionConversionWord(ConfigurableEnvironment environment) {
RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(environment,
"logging.");
return resolver.getProperty("exception-conversion-word", "%wEx");
private void setSystemProperties(ConfigurableEnvironment environment,
LogFile logFile) {
RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(
environment, "logging.");
setSystemProperty(propertyResolver, EXCEPTION_CONVERSION_WORD,
"exception-conversion-word");
setSystemProperty(propertyResolver, CONSOLE_LOG_PATTERN, "pattern.console");
setSystemProperty(propertyResolver, FILE_LOG_PATTERN, "pattern.file");
setSystemProperty(propertyResolver, LOG_LEVEL_PATTERN, "pattern.level");
setSystemProperty(PID_KEY, new ApplicationPid().toString());
if (logFile != null) {
logFile.applyToSystemProperties();
}
}
private void setSystemProperty(RelaxedPropertyResolver propertyResolver,
String systemPropertyName, String propertyName) {
setSystemProperty(systemPropertyName, propertyResolver.getProperty(propertyName));
}
private void setSystemProperty(String name, String value) {
if (System.getProperty(name) == null && value != null) {
System.setProperty(name, value);
}
}
private void initializeEarlyLoggingLevel(ConfigurableEnvironment environment) {
@ -253,10 +293,9 @@ public class LoggingApplicationListener implements GenericApplicationListener {
}
private void initializeSystem(ConfigurableEnvironment environment,
LoggingSystem system) {
LoggingSystem system, LogFile logFile) {
LoggingInitializationContext initializationContext = new LoggingInitializationContext(
environment);
LogFile logFile = LogFile.get(environment);
String logConfig = environment.getProperty(CONFIG_PROPERTY);
if (ignoreLogConfig(logConfig)) {
system.initialize(initializationContext, null, logFile);

3
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View File

@ -157,9 +157,6 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
protected void loadConfiguration(String location, LogFile logFile) {
Assert.notNull(location, "Location must not be null");
if (logFile != null) {
logFile.applyToSystemProperties();
}
try {
LoggerContext ctx = getLoggerContext();
URL url = ResourceUtils.getURL(location);

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

@ -128,9 +128,6 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
protected void loadConfiguration(LoggingInitializationContext initializationContext,
String location, LogFile logFile) {
Assert.notNull(location, "Location must not be null");
if (logFile != null) {
logFile.applyToSystemProperties();
}
LoggerContext loggerContext = getLoggerContext();
stopAndReset(loggerContext);
try {

21
spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java
View File

@ -94,6 +94,9 @@ public class LoggingApplicationListenerTests {
System.clearProperty("LOG_PATH");
System.clearProperty("PID");
System.clearProperty("LOG_EXCEPTION_CONVERSION_WORD");
System.clearProperty("CONSOLE_LOG_PATTERN");
System.clearProperty("FILE_LOG_PATTERN");
System.clearProperty("LOG_LEVEL_PATTERN");
System.clearProperty(LoggingSystem.SYSTEM_PROPERTY);
if (this.context != null) {
this.context.close();
@ -409,6 +412,24 @@ public class LoggingApplicationListenerTests {
childContext.close();
}
@Test
public void systemPropertiesAreSetForLoggingConfiguration() {
EnvironmentTestUtils.addEnvironment(this.context,
"logging.exception-conversion-word=conversion", "logging.file=file",
"logging.path=path", "logging.pattern.console=console",
"logging.pattern.file=file", "logging.pattern.level=level");
this.initializer.initialize(this.context.getEnvironment(),
this.context.getClassLoader());
assertThat(System.getProperty("CONSOLE_LOG_PATTERN")).isEqualTo("console");
assertThat(System.getProperty("FILE_LOG_PATTERN")).isEqualTo("file");
assertThat(System.getProperty("LOG_EXCEPTION_CONVERSION_WORD"))
.isEqualTo("conversion");
assertThat(System.getProperty("LOG_FILE")).isEqualTo("file");
assertThat(System.getProperty("LOG_LEVEL_PATTERN")).isEqualTo("level");
assertThat(System.getProperty("LOG_PATH")).isEqualTo("path");
assertThat(System.getProperty("PID")).isNotNull();
}
private boolean bridgeHandlerInstalled() {
Logger rootLogger = LogManager.getLogManager().getLogger("");
Handler[] handlers = rootLogger.getHandlers();