From 04f0dfa265a03642ca8f7076f0a507ebc86d2e91 Mon Sep 17 00:00:00 2001 From: Mateus Ferraz Date: Wed, 10 Apr 2024 18:13:40 -0300 Subject: [PATCH 1/2] style: Improve logging similarity to InfluxDB --- influxdb/2.7/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/influxdb/2.7/entrypoint.sh b/influxdb/2.7/entrypoint.sh index 2bef975f7..73cb66321 100755 --- a/influxdb/2.7/entrypoint.sh +++ b/influxdb/2.7/entrypoint.sh @@ -46,14 +46,14 @@ function log () { return fi - local attrs='"system": "docker"' + local attrs="system=docker" while [ "$#" -gt 1 ]; do - attrs="${attrs}, \"$1\": \"$2\"" + attrs="${attrs} $1: $2" shift 2 done local -r logtime="$(date --utc +'%FT%T.%NZ')" - 1>&2 echo -e "${logtime}\t${level}\t${msg}\t{${attrs}}" + 1>&2 echo -e "ts=${logtime} lvl=${level} msg=\"${msg}\" ${attrs}" } # Set the global log-level for the entry-point to match the config passed to influxd. From 4586cc01d285cd9e2dbee49640bba6ce266c0072 Mon Sep 17 00:00:00 2001 From: Mateus Ferraz Date: Wed, 10 Apr 2024 18:40:47 -0300 Subject: [PATCH 2/2] style: Improve timestamp formatting --- influxdb/2.7/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/influxdb/2.7/entrypoint.sh b/influxdb/2.7/entrypoint.sh index 73cb66321..72660b71c 100755 --- a/influxdb/2.7/entrypoint.sh +++ b/influxdb/2.7/entrypoint.sh @@ -52,7 +52,7 @@ function log () { shift 2 done - local -r logtime="$(date --utc +'%FT%T.%NZ')" + local -r logtime=$(date --utc +%FT%T.%6NZ) 1>&2 echo -e "ts=${logtime} lvl=${level} msg=\"${msg}\" ${attrs}" }