[XEN-3155] fix entrypoint scripts failing the json logging test because they do not report the correct fields for an application type log

NotAPenguin0 · NotAPenguin0 · commit a4baab84add0 · 2025-11-17T10:46:08.000+01:00
diff --git a/tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/90-logging-env-vars.sh b/tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/90-logging-env-vars.sh
@@ -5,7 +5,7 @@ set -e
 # LOG_LEVEL_ environment variables and tells the Java process to use it.
 
 function log() {
-  echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'
+  echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'
 }
 
 if [ "$LOG4J_VERSION" = "1" ]; then

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ set -e`
`5`	`5`	`# LOG_LEVEL_ environment variables and tells the Java process to use it.`
`6`	`6`
`7`	`7`	`function log() {`
`8`		`- echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'`
	`8`	`+ echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "'"$1"'"}'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`if [ "$LOG4J_VERSION" = "1" ]; then`