Commit fa9afb08 authored by David Kerr's avatar David Kerr
Browse files

Merge remote-tracking branch 'upstream/master' into ssh-deploy

parents 712b8951 e02bede4
...@@ -76,17 +76,17 @@ SYSLOG_INFO="user.info" ...@@ -76,17 +76,17 @@ SYSLOG_INFO="user.info"
SYSLOG_DEBUG="user.debug" SYSLOG_DEBUG="user.debug"
#error #error
SYSLOG_LEVEL_1=1 SYSLOG_LEVEL_ERROR=3
#info #info
SYSLOG_LEVEL_2=2 SYSLOG_LEVEL_INFO=6
#debug #debug
SYSLOG_LEVEL_3=3 SYSLOG_LEVEL_DEBUG=7
#debug2 #debug2
SYSLOG_LEVEL_4=4 SYSLOG_LEVEL_DEBUG_2=8
#debug3 #debug3
SYSLOG_LEVEL_5=5 SYSLOG_LEVEL_DEBUG_3=9
SYSLOG_LEVEL_DEFAULT=$SYSLOG_LEVEL_1 SYSLOG_LEVEL_DEFAULT=$SYSLOG_LEVEL_ERROR
#none #none
SYSLOG_LEVEL_NONE=0 SYSLOG_LEVEL_NONE=0
...@@ -174,7 +174,7 @@ _log() { ...@@ -174,7 +174,7 @@ _log() {
_info() { _info() {
_log "$@" _log "$@"
if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_2" ]; then if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_INFO" ]; then
_syslog "$SYSLOG_INFO" "$@" _syslog "$SYSLOG_INFO" "$@"
fi fi
_printargs "$@" _printargs "$@"
...@@ -204,7 +204,7 @@ _debug() { ...@@ -204,7 +204,7 @@ _debug() {
if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_1" ]; then if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_1" ]; then
_log "$@" _log "$@"
fi fi
if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_3" ]; then if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_DEBUG" ]; then
_syslog "$SYSLOG_DEBUG" "$@" _syslog "$SYSLOG_DEBUG" "$@"
fi fi
if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_1" ]; then if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_1" ]; then
...@@ -216,7 +216,7 @@ _debug2() { ...@@ -216,7 +216,7 @@ _debug2() {
if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_2" ]; then if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_2" ]; then
_log "$@" _log "$@"
fi fi
if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_4" ]; then if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_DEBUG_2" ]; then
_syslog "$SYSLOG_DEBUG" "$@" _syslog "$SYSLOG_DEBUG" "$@"
fi fi
if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_2" ]; then if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_2" ]; then
...@@ -228,7 +228,7 @@ _debug3() { ...@@ -228,7 +228,7 @@ _debug3() {
if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_3" ]; then if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_3" ]; then
_log "$@" _log "$@"
fi fi
if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_5" ]; then if [ "${SYS_LOG:-$SYSLOG_LEVEL_NONE}" -ge "$SYSLOG_LEVEL_DEBUG_3" ]; then
_syslog "$SYSLOG_DEBUG" "$@" _syslog "$SYSLOG_DEBUG" "$@"
fi fi
if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_3" ]; then if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_3" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment