Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim trailing whitespace from value of logging.config

Browse Source 
Closes gh-22078
This commit is contained in:
Madhura Bhave
2020-06-25 15:17:59 -07:00
parent d12b6b3a86
commit c3ddfcdbf5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java
View File

@@ -301,7 +301,7 @@ public class LoggingApplicationListener implements GenericApplicationListener {
private void initializeSystem(ConfigurableEnvironment environment, LoggingSystem system, LogFile logFile) {
LoggingInitializationContext initializationContext = new LoggingInitializationContext(environment);
String logConfig = environment.getProperty(CONFIG_PROPERTY);
String logConfig = StringUtils.trimWhitespace(environment.getProperty(CONFIG_PROPERTY));
if (ignoreLogConfig(logConfig)) {
system.initialize(initializationContext, null, logFile);
}

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
View File

@@ -160,6 +160,14 @@ class LoggingApplicationListenerTests {
assertThat(this.output).contains("Hello world").doesNotContain("???").startsWith("null ").endsWith("BOOTBOOT");
}
@Test
void trailingWhitespaceInLoggingConfigShouldBeTrimmed() {
addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-nondefault.xml ");
this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader());
this.logger.info("Hello world");
assertThat(this.output).contains("Hello world").doesNotContain("???").startsWith("null ").endsWith("BOOTBOOT");
}
@Test
void overrideConfigDoesNotExist() {
addPropertiesToEnvironment(this.context, "logging.config=doesnotexist.xml");