From 73be2c056fb75ba589e12bda260b8c7567543acc Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 13 Jul 2015 13:20:23 -0700 Subject: [PATCH] Clear logback status list on reset Update LogbackLoggingSystem to clear logback status messages on reset. This prevents shutdown errors from preventing subsequent startup. Fixes gh-3472 --- spring-boot-samples/spring-boot-sample-tomcat-jsp/.gitignore | 1 + spring-boot-samples/spring-boot-sample-tomcat7-jsp/.gitignore | 1 + spring-boot-samples/spring-boot-sample-traditional/.gitignore | 1 + spring-boot-samples/spring-boot-sample-web-jsp/.gitignore | 1 + .../boot/logging/logback/LogbackLoggingSystem.java | 1 + 5 files changed, 5 insertions(+) create mode 100644 spring-boot-samples/spring-boot-sample-tomcat-jsp/.gitignore create mode 100644 spring-boot-samples/spring-boot-sample-tomcat7-jsp/.gitignore create mode 100644 spring-boot-samples/spring-boot-sample-traditional/.gitignore create mode 100644 spring-boot-samples/spring-boot-sample-web-jsp/.gitignore diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/.gitignore b/spring-boot-samples/spring-boot-sample-tomcat-jsp/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/.gitignore b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/spring-boot-samples/spring-boot-sample-traditional/.gitignore b/spring-boot-samples/spring-boot-sample-traditional/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-traditional/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/.gitignore b/spring-boot-samples/spring-boot-sample-web-jsp/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-web-jsp/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 5fe4adf48f..ce5998f619 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -168,6 +168,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { @Override protected void reinitialize(LoggingInitializationContext initializationContext) { getLoggerContext().reset(); + getLoggerContext().getStatusManager().clear(); loadConfiguration(initializationContext, getSelfInitializationConfig(), null); }