Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41712 from nkolosnjaji

Browse Source 
* pr/41712:
  Polish "Harmonize use of StructuredLogEncoder"
  Harmonize use of StructuredLogEncoder

Closes gh-41712
This commit is contained in:
Stéphane Nicoll
2024-08-07 20:20:27 +02:00
parent afe0dd2222 33711828f9
commit a4c428a328
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
View File

@@ -161,7 +161,7 @@ class DefaultLogbackConfiguration {
Charset charset = resolveCharset(config, "${" + type + "_LOG_CHARSET}");
String structuredLogFormat = resolve(config, "${" + type + "_LOG_STRUCTURED_FORMAT}");
if (StringUtils.hasLength(structuredLogFormat)) {
StructuredLogEncoder encoder = createStructuredLoggingEncoder(config, structuredLogFormat);
StructuredLogEncoder encoder = createStructuredLogEncoder(config, structuredLogFormat);
encoder.setCharset(charset);
return encoder;
}
@@ -171,7 +171,7 @@ class DefaultLogbackConfiguration {
return encoder;
}
private StructuredLogEncoder createStructuredLoggingEncoder(LogbackConfigurator config, String format) {
private StructuredLogEncoder createStructuredLogEncoder(LogbackConfigurator config, String format) {
StructuredLogEncoder encoder = new StructuredLogEncoder();
encoder.setFormat(format);
return encoder;

2
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml
View File

@@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${CONSOLE_LOG_THRESHOLD}</level>
</filter>
<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
<format>${CONSOLE_LOG_STRUCTURED_FORMAT}</format>
<charset>${CONSOLE_LOG_CHARSET}</charset>
</encoder>

2
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml
View File

@@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${FILE_LOG_THRESHOLD}</level>
</filter>
<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
<format>${FILE_LOG_STRUCTURED_FORMAT}</format>
<charset>${FILE_LOG_CHARSET}</charset>
</encoder>

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java
View File

@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* @author Moritz Halbritter
* @author Phillip Webb
*/
class StructuredLoggingEncoderTests extends AbstractStructuredLoggingTests {
class StructuredLogEncoderTests extends AbstractStructuredLoggingTests {
private StructuredLogEncoder encoder;