Commit 2cb4403

mrifnisnicoll

authored and

committed

Automatically detect log4j2.properties

1 parent 1261c39 commit 2cb4403Copy full SHA for 2cb4403

File tree

-2

lines changed

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

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ protected String[] getStandardConfigLocations() {`
`112`	`112`
`113`	`113`	`private String[] getCurrentlySupportedConfigLocations() {`
`114`	`114`	`List<String> supportedConfigLocations = new ArrayList<>();`
	`115`	`+ supportedConfigLocations.add("log4j2.properties");`
`115`	`116`	`if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) {`
`116`	`117`	`Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml");`
`117`	`118`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public void loggingThatUsesJulIsCaptured() {`
`211`	`211`	`@Test`
`212`	`212`	`public void configLocationsWithNoExtraDependencies() {`
`213`	`213`	`assertThat(this.loggingSystem.getStandardConfigLocations())`
`214`		`- .contains("log4j2.xml");`
	`214`	`+ .contains("log4j2.properties", "log4j2.xml");`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`@Test`
`@@ -241,7 +241,8 @@ public void configLocationsWithJacksonDatabindAndDataformatYaml() {`
`241`	`241`	`@Test`
`242`	`242`	`public void springConfigLocations() {`
`243`	`243`	`String[] locations = getSpringConfigLocations(this.loggingSystem);`
`244`		`- assertThat(locations).isEqualTo(new String[] { "log4j2-spring.xml" });`
	`244`	`+ assertThat(locations).isEqualTo(`
	`245`	`+ new String[] { "log4j2-spring.properties", "log4j2-spring.xml" });`
`245`	`246`	`}`
`246`	`247`
`247`	`248`	`@Test`

Comments

(0)