evolix/evobackup
22
0
Fork 1
Code Issues 28 Pull requests 5 Releases 20 Activity

No date/process in stdout/stderr

Browse source 
Don't treat stdout/stderr as a logging facility
This commit is contained in:
Jérémy Lecour 2021-06-29 07:57:44 +02:00 committed by Jérémy Lecour
parent 49fff6e85d
commit b1b4d8b19f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/includes
View file

@ -71,7 +71,7 @@ process_name() {
debug() { debug() {
msg="${1:-$(cat /dev/stdin)}" msg="${1:-$(cat /dev/stdin)}"
if [ "${LOGLEVEL}" -ge 7 ]; then if [ "${LOGLEVEL}" -ge 7 ]; then
echo "$(log_date) DEBUG $(process_name) ${msg}" echo "${msg}"
logger -t bkctld -p daemon.debug "$(process_name) ${msg}" logger -t bkctld -p daemon.debug "$(process_name) ${msg}"
fi fi
} }
@ -79,22 +79,22 @@ debug() {
info() { info() {
msg="${1:-$(cat /dev/stdin)}" msg="${1:-$(cat /dev/stdin)}"
if [ "${LOGLEVEL}" -ge 6 ]; then if [ "${LOGLEVEL}" -ge 6 ]; then
tty -s && echo "$(log_date) INFO $(process_name) ${msg}" tty -s && echo "${msg}"
logger -t bkctld -p daemon.info "$(process_name) ${msg}" logger -t bkctld -p daemon.info "$(process_name) ${msg}"
fi fi
} }
notice() { notice() {
msg="${1:-$(cat /dev/stdin)}" msg="${1:-$(cat /dev/stdin)}"
tty -s && echo "$(log_date) NOTICE $(process_name) ${msg}" tty -s && echo "${msg}"
[ "${LOGLEVEL}" -ge 5 ] && logger -t bkctld -p daemon.notice "$(process_name) ${msg}" [ "${LOGLEVEL}" -ge 5 ] && logger -t bkctld -p daemon.notice "$(process_name) ${msg}"
} }
warning() { warning() {
msg="${1:-$(cat /dev/stdin)}" msg="${1:-$(cat /dev/stdin)}"
tty -s && echo "$(log_date) WARNING $(process_name) ${msg}" >&2 tty -s && echo "${msg}" >&2
if [ "${LOGLEVEL}" -ge 4 ]; then if [ "${LOGLEVEL}" -ge 4 ]; then
tty -s || echo "$(log_date) WARNING $(process_name) ${msg}" >&2 tty -s || echo "${msg}" >&2
logger -t bkctld -p daemon.warning "$(process_name) ${msg}" logger -t bkctld -p daemon.warning "$(process_name) ${msg}"
fi fi
} }
@ -105,9 +105,9 @@ warning() {
error() { error() {
msg="${1:-$(cat /dev/stdin)}" msg="${1:-$(cat /dev/stdin)}"
rc="${2:-1}" rc="${2:-1}"
tty -s && echo "$(log_date) ERROR $(process_name) ${msg}" >&2 tty -s && echo "${msg}" >&2
if [ "${LOGLEVEL}" -ge 5 ]; then if [ "${LOGLEVEL}" -ge 5 ]; then
tty -s || echo "$(log_date) ERROR $(process_name) ${msg}" >&2 tty -s || echo "${msg}" >&2
logger -t bkctld -p daemon.error "$(process_name) ${msg}" logger -t bkctld -p daemon.error "$(process_name) ${msg}"
fi fi
exit ${rc} exit ${rc}