Browse Source

Merge branch '3.3.x' into 3.4.x

Closes gh-45399
pull/45650/head
Phillip Webb 9 months ago
parent
commit
d43c67b00b
  1. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
  2. 7
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java

@ -147,7 +147,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { @@ -147,7 +147,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
Configuration configuration = this.loggingSystem.getConfiguration();
assertThat(output).contains("Hello world").doesNotContain("Hidden");
assertThat(new File(tmpDir() + "/spring.log")).exists();
assertThat(configuration.getConfigurationSource().getFile()).isNotNull();
assertThat(configuration.getConfigurationSource().getLocation()).contains("/log4j2-file.xml");
}
@Test

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/TestLog4J2LoggingSystem.java

@ -21,6 +21,7 @@ import java.util.Collections; @@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
class TestLog4J2LoggingSystem extends Log4J2LoggingSystem {
@ -34,7 +35,11 @@ class TestLog4J2LoggingSystem extends Log4J2LoggingSystem { @@ -34,7 +35,11 @@ class TestLog4J2LoggingSystem extends Log4J2LoggingSystem {
}
Configuration getConfiguration() {
return ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false)).getConfiguration();
return getLoggerContext().getConfiguration();
}
private LoggerContext getLoggerContext() {
return (LoggerContext) LogManager.getContext(false);
}
@Override

Loading…
Cancel
Save