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

Avoid installing unwanted ConsoleHandler when cleaning up 

Closes gh-13470
This commit is contained in:
Andy Wilkinson 2018-07-30 13:00:34 +01:00
parent 01abb196ef
commit 06b4007ce4
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/Slf4JLoggingSystem.java
View File

@ -50,7 +50,6 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
public void cleanUp() { public void cleanUp() {
if (isBridgeHandlerAvailable()) { if (isBridgeHandlerAvailable()) {
removeJdkLoggingBridgeHandler(); removeJdkLoggingBridgeHandler();
reinstateConsoleHandlerIfNecessary();
} }
} }
@ -81,17 +80,18 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
* @since 2.0.4 * @since 2.0.4
*/ */
protected final boolean isBridgeJulIntoSlf4j() { protected final boolean isBridgeJulIntoSlf4j() {
return isBridgeHandlerAvailable() && isJulUsingItsDefaultConfiguration(); return isBridgeHandlerAvailable() && isJulUsingASingleConsoleHandlerAtMost();
} }
protected final boolean isBridgeHandlerAvailable() { protected final boolean isBridgeHandlerAvailable() {
return ClassUtils.isPresent(BRIDGE_HANDLER, getClassLoader()); return ClassUtils.isPresent(BRIDGE_HANDLER, getClassLoader());
} }
private boolean isJulUsingItsDefaultConfiguration() { private boolean isJulUsingASingleConsoleHandlerAtMost() {
Logger rootLogger = LogManager.getLogManager().getLogger(""); Logger rootLogger = LogManager.getLogManager().getLogger("");
Handler[] handlers = rootLogger.getHandlers(); Handler[] handlers = rootLogger.getHandlers();
return handlers.length == 1 && handlers[0] instanceof ConsoleHandler; return handlers.length == 0
|| (handlers.length == 1 && handlers[0] instanceof ConsoleHandler);
} }
private void removeJdkLoggingBridgeHandler() { private void removeJdkLoggingBridgeHandler() {
@ -117,11 +117,4 @@ public abstract class Slf4JLoggingSystem extends AbstractLoggingSystem {
} }
} }
private void reinstateConsoleHandlerIfNecessary() {
Logger rootLogger = LogManager.getLogManager().getLogger("");
if (rootLogger.getHandlers().length == 0) {
rootLogger.addHandler(new ConsoleHandler());
}
}
} }