File tree Expand file tree Collapse file tree 3 files changed +14
-3
lines changed
spring-boot-project/spring-boot/src
main/resources/org/springframework/boot/logging/log4j2
test/java/org/springframework/boot/logging/log4j2 Expand file tree Collapse file tree 3 files changed +14
-3
lines changed Original file line number Diff line number Diff line change 55 <Property name =" LOG_LEVEL_PATTERN" >%5p</Property >
66 <Property name =" LOG_DATEFORMAT_PATTERN" >yyyy-MM-dd'T'HH:mm:ss.SSSXXX</Property >
77 <Property name =" CONSOLE_LOG_PATTERN" >%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:-}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
8- <Property name =" FILE_LOG_PATTERN" >%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
8+ <Property name =" FILE_LOG_PATTERN" >%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:- }[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
99 </Properties >
1010 <Appenders >
1111 <Console name =" Console" target =" SYSTEM_OUT" follow =" true" >
Original file line number Diff line number Diff line change 44 <Property name =" LOG_EXCEPTION_CONVERSION_WORD" >%xwEx</Property >
55 <Property name =" LOG_LEVEL_PATTERN" >%5p</Property >
66 <Property name =" LOG_DATEFORMAT_PATTERN" >yyyy-MM-dd'T'HH:mm:ss.SSSXXX</Property >
7- <Property name =" CONSOLE_LOG_PATTERN" >%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
8- <Property name =" FILE_LOG_PATTERN" >%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
7+ <Property name =" CONSOLE_LOG_PATTERN" >%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:- }[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
8+ <Property name =" FILE_LOG_PATTERN" >%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:- }[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property >
99 </Properties >
1010 <Appenders >
1111 <Console name =" Console" target =" SYSTEM_OUT" follow =" true" >
Original file line number Diff line number Diff line change @@ -574,6 +574,17 @@ void applicationNameLoggingWhenHasApplicationName(CapturedOutput output) {
574574 assertThat (getLineWithText (output , "Hello world" )).contains ("[myapp] " );
575575 }
576576
577+ @ Test
578+ void applicationNamePlaceHolderNotShowingWhenDisabled (CapturedOutput output ) {
579+ this .environment .setProperty ("spring.application.name" , "application-name" );
580+ this .environment .setProperty ("logging.include-application-name" , "false" );
581+ this .loggingSystem .setStandardConfigLocations (false );
582+ this .loggingSystem .beforeInitialize ();
583+ this .loggingSystem .initialize (this .initializationContext , null , null );
584+ this .logger .info ("Hello world" );
585+ assertThat (getLineWithText (output , "Hello world" )).doesNotContain ("${sys:LOGGED_APPLICATION_NAME}" );
586+ }
587+
577588 @ Test
578589 void applicationNameLoggingWhenDisabled (CapturedOutput output ) {
579590 this .environment .setProperty ("spring.application.name" , "myapp" );
You can’t perform that action at this time.
0 commit comments