feat(logger): Update journal logging function
Use new standardized format fields.
This commit is contained in:
@@ -103,62 +103,21 @@ writeJsonLog() {
|
||||
|
||||
# $1: message, $2: level, $3: status, $4: operation, $5: code
|
||||
writeJournalDLog() {
|
||||
# translate error levels
|
||||
if [ -z "$2" ]; then
|
||||
LOG_LEVEL=1
|
||||
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
|
||||
# not enough information to generate a meaningful log message
|
||||
if [ -z "$1" ] || [ $# -lt 3 ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
# log the message
|
||||
if [ -z "$1" ]; then
|
||||
logger --journald <<end
|
||||
MESSAGE_ID="$(systemd-id128 new)"
|
||||
logger --journald <<end
|
||||
SYSLOG_TIMESTAMP="$(getTimeStamp)"
|
||||
SYSLOG_FACILITY=3
|
||||
SYSLOG_IDENTIFIER="${LOG_PROGRAM_NAME}"
|
||||
PRIORITY=4
|
||||
ERRNO="${LOG_DEFAULT_CODE}"
|
||||
OPERATION="${LOG_DEFAULT_OPERATION}"
|
||||
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}"
|
||||
SYSLOG_PID="$$"
|
||||
PRIORITY="$(translateLogLevelsToJournalD "$2")"
|
||||
STATUS="$(uppercase "$3")"
|
||||
MESSAGE="$1"
|
||||
STATUS="${3:-$LOG_DEFAULT_STATUS}"
|
||||
OPERATION="${4:UNSPECIFIED}"
|
||||
ERRNO="${5:999}"
|
||||
end
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user