Skip to content

Commit a86b91b

Browse files
committed
[XEN-3155] fix entrypoint script not producing json logs
1 parent 81edca3 commit a86b91b

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/90-logging-env-vars.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ set -e
66

77
LOG_CONFIG_FILE="/generated-log-config.properties"
88

9-
echo "Generating log config at: ${LOG_CONFIG_FILE}"
10-
echo "Using Log4j Version: ${LOG4J_VERSION}"
9+
function log() {
10+
echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : " '"$1"' " }'
11+
}
12+
13+
log "Generating log config at: ${LOG_CONFIG_FILE}"
14+
log "Using Log4j Version: ${LOG4J_VERSION}"
1115

1216
# Start with a clean file
1317
touch "${LOG_CONFIG_FILE}"
@@ -26,7 +30,7 @@ for var in $(env); do
2630
logger_name=$(echo "$var_name" | sed 's/LOG_LEVEL_//' | sed 's/_/./g')
2731

2832
if [ -n "$logger_name" ] && [ -n "$var_value" ]; then
29-
echo "Applying log level: ${logger_name}=${var_value}"
33+
log "Applying log level: ${logger_name}=${var_value}"
3034

3135
if [ "$LOG4J_VERSION" = "1" ]; then
3236
# Log4j 1.x syntax
@@ -47,7 +51,7 @@ done
4751

4852
if [ "$LOG4J_VERSION" = "1" ]; then
4953
# --- Log4j 1.x Config ---
50-
echo "Generating Log4j config."
54+
log "Generating Log4j config."
5155
echo "# Auto-generated Log4j 1.x config" >> "${LOG_CONFIG_FILE}"
5256

5357
# Add a basic console appender
@@ -94,4 +98,4 @@ fi
9498
# Export new Java options with updated log config
9599
export JAVA_OPTS
96100

97-
echo "Log configuration complete. JAVA_OPTS updated."
101+
log "Log configuration complete. JAVA_OPTS updated."

0 commit comments

Comments
 (0)