SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust the logging lifecycle during bootstrap

Browse Source 
Anticipating a change in Spring Boot 1.4.1 to support child context
creation without (needless) re-initialization of the logging system,
we need to carefully manage the lifecycle, in particular calling
cleanUp() when we know there are changes in the pipeline.

Fixes gh-125
This commit is contained in:
Dave Syer
2016-08-25 18:02:34 +01:00
parent cecac1125e
commit 7f687b10e3
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
View File

@@ -29,6 +29,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.builder.ParentContextApplicationContextInitializer; import org.springframework.boot.builder.ParentContextApplicationContextInitializer;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
import org.springframework.boot.logging.LoggingSystem;
import org.springframework.cloud.bootstrap.encrypt.EnvironmentDecryptApplicationInitializer; import org.springframework.cloud.bootstrap.encrypt.EnvironmentDecryptApplicationInitializer;
import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@@ -84,6 +85,11 @@ public class BootstrapApplicationListener
ConfigurableApplicationContext context = bootstrapServiceContext(environment, ConfigurableApplicationContext context = bootstrapServiceContext(environment,
event.getSpringApplication()); event.getSpringApplication());
apply(context, event.getSpringApplication(), environment); apply(context, event.getSpringApplication(), environment);
// Clean up the logging system. Logging will go dark until the
// ConfigFileApplicationListener fires, but this is the price we pay for that
// listener being able to adjust the log levels according to what it finds in its
// own configuration.
LoggingSystem.get(ClassUtils.getDefaultClassLoader()).cleanUp();
} }
private ConfigurableApplicationContext bootstrapServiceContext( private ConfigurableApplicationContext bootstrapServiceContext(
@@ -121,9 +127,7 @@ public class BootstrapApplicationListener
.profiles(environment.getActiveProfiles()).bannerMode(Mode.OFF) .profiles(environment.getActiveProfiles()).bannerMode(Mode.OFF)
.environment(bootstrapEnvironment) .environment(bootstrapEnvironment)
.properties("spring.application.name:" + configName) .properties("spring.application.name:" + configName)
.registerShutdownHook(false) .registerShutdownHook(false).logStartupInfo(false).web(false);
.logStartupInfo(false)
.web(false);
List<Class<?>> sources = new ArrayList<>(); List<Class<?>> sources = new ArrayList<>();
for (String name : names) { for (String name : names) {
Class<?> cls = ClassUtils.resolveClassName(name, null); Class<?> cls = ClassUtils.resolveClassName(name, null);

5
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
View File

@@ -118,6 +118,11 @@ public class PropertySourceBootstrapConfiguration implements
.get(LoggingSystem.class.getClassLoader()); .get(LoggingSystem.class.getClassLoader());
try { try {
ResourceUtils.getURL(logConfig).openStream().close(); ResourceUtils.getURL(logConfig).openStream().close();
// Three step initialization that accounts for the clean up of the logging
// context before initialization. Spring Boot doesn't initialize a logging
// system that hasn't had this sequence applied (since 1.4.1).
system.cleanUp();
system.beforeInitialize();
system.initialize(new LoggingInitializationContext(environment), system.initialize(new LoggingInitializationContext(environment),
logConfig, logFile); logConfig, logFile);
} }