feat(logger): Update journal logging function

Use new standardized format fields.
This commit is contained in:
2026-07-22 23:24:52 -06:00
parent 56a5ad59fe
commit aa446c00e6
+8 -49
View File
@@ -103,62 +103,21 @@ writeJsonLog() {
# $1: message, $2: level, $3: status, $4: operation, $5: code # $1: message, $2: level, $3: status, $4: operation, $5: code
writeJournalDLog() { writeJournalDLog() {
# translate error levels # not enough information to generate a meaningful log message
if [ -z "$2" ]; then if [ -z "$1" ] || [ $# -lt 3 ]; then
LOG_LEVEL=1 return
else
case "$2" in
"emergency" | "emerg")
LOG_LEVEL=7
;;
"alert")
LOG_LEVEL=6
;;
"critical" | "crit")
LOG_LEVEL=5
;;
"error" | "err")
LOG_LEVEL=4
;;
"warning" | "warn")
LOG_LEVEL=3
;;
"notice")
LOG_LEVEL=2
;;
"info")
LOG_LEVEL=1
;;
"debug")
LOG_LEVEL=0
;;
esac
fi fi
# log the message
if [ -z "$1" ]; then
logger --journald <<end logger --journald <<end
MESSAGE_ID="$(systemd-id128 new)"
SYSLOG_TIMESTAMP="$(getTimeStamp)" SYSLOG_TIMESTAMP="$(getTimeStamp)"
SYSLOG_FACILITY=3 SYSLOG_FACILITY=3
SYSLOG_IDENTIFIER="${LOG_PROGRAM_NAME}" SYSLOG_IDENTIFIER="${LOG_PROGRAM_NAME}"
PRIORITY=4 SYSLOG_PID="$$"
ERRNO="${LOG_DEFAULT_CODE}" PRIORITY="$(translateLogLevelsToJournalD "$2")"
OPERATION="${LOG_DEFAULT_OPERATION}" STATUS="$(uppercase "$3")"
MESSAGE="${LOG_DEFAULT_MESSAGE}"
STATUS="${LOG_DEFAULT_STATUS}"
end
else
logger --journald <<end
MESSAGE_ID="$(systemd-id128 new)"
SYSLOG_TIMESTAMP="$(getTimeStamp)"
SYSLOG_FACILITY=3
SYSLOG_IDENTIFIER="${LOG_PROGRAM_NAME}"
PRIORITY="${LOG_LEVEL}"
ERRNO="${5:-$LOG_DEFAULT_CODE}"
OPERATION="${4:-$LOG_DEFAULT_OPERATION}"
MESSAGE="$1" MESSAGE="$1"
STATUS="${3:-$LOG_DEFAULT_STATUS}" OPERATION="${4:UNSPECIFIED}"
ERRNO="${5:999}"
end end
fi fi