Polish

mhalbritter · Jun 20, 2024 · 76948a1 · 76948a1
1 parent bc46720
commit 76948a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...t/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingFormats.java b/...t/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingFormats.java
@@ -79,6 +79,7 @@ public StructuredLoggingFormat get(String format) {
 	 * @return the loaded structured logging formats
 	 */
 	public static StructuredLoggingFormats loadFromSpringFactories(SpringFactoriesLoader loader) {
+		Assert.notNull(loader, "Loader must not be null");
 		return new StructuredLoggingFormats(loader.load(StructuredLoggingFormat.class));
 	}
 

diff --git a/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml b/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
@@ -24,7 +24,7 @@
 		<RollingFile name="File" fileName="${sys:LOG_FILE}" filePattern="${sys:LOG_PATH}/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
 			<Select>
 				<StructuredLoggingEnabledArbiter appender="file">
-					<StructuredLoggingLayout format="${sys:FILE_LOG_STRUCTURED}" charset="${sys:FILE_LOG_CHARSET}"/>
+					<StructuredLoggingLayout format="${sys:FILE_LOG_STRUCTURED}" charset="${sys:FILE_LOG_CHARSET}" logMdc="true"/>
 				</StructuredLoggingEnabledArbiter>
 				<DefaultArbiter>
 					<PatternLayout pattern="${sys:FILE_LOG_PATTERN}" charset="${sys:FILE_LOG_CHARSET}"/>