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

Merge branch '2.1.x' 

Closes gh-17470
This commit is contained in:
Andy Wilkinson 2019-07-09 20:05:30 +01:00
parent c7311631c0 6748b20863
commit be3a737532
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
View File

@ -21,6 +21,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
@ -51,6 +52,8 @@ public class JavaLoggingSystem extends AbstractLoggingSystem {
private static final LogLevels<Level> LEVELS = new LogLevels<>();
private final Set<Logger> configuredLoggers = Collections.synchronizedSet(new HashSet<>());
static {
LEVELS.map(LogLevel.TRACE, Level.FINEST);
LEVELS.map(LogLevel.DEBUG, Level.FINE);
@ -119,6 +122,7 @@ public class JavaLoggingSystem extends AbstractLoggingSystem {
}
Logger logger = Logger.getLogger(loggerName);
if (logger != null) {
this.configuredLoggers.add(logger);
logger.setLevel(LEVELS.convertSystemToNative(level));
}
}
@ -159,6 +163,11 @@ public class JavaLoggingSystem extends AbstractLoggingSystem {
return new ShutdownHandler();
}
@Override
public void cleanUp() {
this.configuredLoggers.clear();
}
private final class ShutdownHandler implements Runnable {
@Override