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

Add Spring Environment to LoggerContext 

Update `Log4J2LoggingSystem` to add the Spring `Environment` to Log4j2's
`LoggerContext`. This allow Log4j2 plugins to access the `Environment`
if they need it.

See gh-32731
This commit is contained in:
Ralph Goers 2022-10-12 11:17:09 -07:00 committed by Phillip Webb
parent 65109bda10
commit 05a2bd4585
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View File

@ -60,6 +60,7 @@ import org.springframework.boot.logging.LoggingSystem;
import org.springframework.boot.logging.LoggingSystemFactory; import org.springframework.boot.logging.LoggingSystemFactory;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -84,6 +85,11 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
private static final String LOG4J_LOG_MANAGER = "org.apache.logging.log4j.jul.LogManager"; private static final String LOG4J_LOG_MANAGER = "org.apache.logging.log4j.jul.LogManager";
/**
* Identifies the Spring environment.
*/
public static final String ENVIRONMENT_KEY = "SpringEnvironment";
private static final LogLevels<Level> LEVELS = new LogLevels<>(); private static final LogLevels<Level> LEVELS = new LogLevels<>();
static { static {
@ -227,6 +233,8 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
if (isAlreadyInitialized(loggerContext)) { if (isAlreadyInitialized(loggerContext)) {
return; return;
} }
Environment environment = initializationContext.getEnvironment();
getLoggerContext().putObjectIfAbsent(ENVIRONMENT_KEY, environment);
loggerContext.getConfiguration().removeFilter(FILTER); loggerContext.getConfiguration().removeFilter(FILTER);
super.initialize(initializationContext, configLocation, logFile); super.initialize(initializationContext, configLocation, logFile);
markAsInitialized(loggerContext); markAsInitialized(loggerContext);