diff --git a/README.md b/README.md index 4984e16..5b0d223 100644 --- a/README.md +++ b/README.md @@ -89,9 +89,9 @@ CMD ["crond", "-f"] ### Logging - In Dev All `stdout` is captured, formatted, and saved to `/var/log/crontab/jobs.log`. Set `LOG_FILE` to `/dev/null` to disable logging. -example: `2017-06-18T01:27:10+0000 e6ced859-1563-493b-b1b1-5a190b29e938 [info] Start Cronjob **map-a-vol** map a volume` +example: `e6ced859-1563-493b-b1b1-5a190b29e938 2017-06-18T01:27:10+0000 [info] Start Cronjob **map-a-vol** map a volume` -grok: `CRONTABLOG %{TIMESTAMP_ISO8601:timestamp} %{DATA:request_id} \[%{LOGLEVEL:severity}\] %{GREEDYDATA:message}` +grok: `CRONTABLOG %{DATA:request_id} %{TIMESTAMP_ISO8601:timestamp} \[%{LOGLEVEL:severity}\] %{GREEDYDATA:message}` ## TODO diff --git a/docker-entrypoint b/docker-entrypoint index 5ae2289..e4ca754 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -163,8 +163,8 @@ set -e # TODO find workaround # [error] write /dev/stdout: broken pipe <- when using docker commands #UUID=\$(cat /proc/sys/kernel/random/uuid) -#exec > >(read message; echo "\$(date -Iseconds) \${UUID} [info] \$message" | tee -a ${LOG_FILE} ) -#exec 2> >(read message; echo "\$(date -Iseconds) \${UUID} [error] \$message" | tee -a ${LOG_FILE} >&2) +#exec > >(read message; echo "\${UUID} \$(date -Iseconds) [info] \$message" | tee -a ${LOG_FILE} ) +#exec 2> >(read message; echo "\${UUID} \$(date -Iseconds) [error] \$message" | tee -a ${LOG_FILE} >&2) echo "Start Cronjob **${SCRIPT_NAME}** ${COMMENT}" diff --git a/test b/test index 7cb4a1e..04d19c9 100755 --- a/test +++ b/test @@ -5,8 +5,8 @@ LOG_FILE=./jobs.log touch ${LOG_FILE} UUID="xxxxxxxxxxxxxxxxx" -exec > >(read message; echo "$(date) ${UUID} [info] $message" | tee -a ${LOG_FILE} ) -exec 2> >(read message; echo "$(date) ${UUID} [error] $message" | tee -a ${LOG_FILE} >&2) +exec > >(read message; echo "${UUID} $(date) [info] $message" | tee -a ${LOG_FILE} ) +exec 2> >(read message; echo "${UUID} $(date) [error] $message" | tee -a ${LOG_FILE} >&2) echo "Start"