From d36c77d777a60f7b6b2794ba4b9d342f61fb2a53 Mon Sep 17 00:00:00 2001 From: deajan Date: Thu, 3 Mar 2016 16:29:32 +0100 Subject: [PATCH] Moved loglevel from stdout to logfile only --- dev/debug_obackup.sh | 8 ++++---- dev/ofunctions.sh | 8 ++++---- obackup.sh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index bfb24a2..164e488 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016030301 IS_STABLE=no -## FUNC_BUILD=2016030301 +## FUNC_BUILD=2016030302 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -107,15 +107,15 @@ function Logger { # if [ "$level" == "CRITICAL" ]; then - _Logger "$prefix\e[41m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "ERROR" ]; then - _Logger "$prefix\e[91m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "WARN" ]; then - _Logger "$prefix\e[93m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" WARN_ALERT=1 return elif [ "$level" == "NOTICE" ]; then diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index a5ff7cb..673042b 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -1,4 +1,4 @@ -## FUNC_BUILD=2016030301 +## FUNC_BUILD=2016030302 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -97,15 +97,15 @@ function Logger { # if [ "$level" == "CRITICAL" ]; then - _Logger "$prefix\e[41m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "ERROR" ]; then - _Logger "$prefix\e[91m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "WARN" ]; then - _Logger "$prefix\e[93m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" WARN_ALERT=1 return elif [ "$level" == "NOTICE" ]; then diff --git a/obackup.sh b/obackup.sh index eb0f91e..e4c0a5c 100755 --- a/obackup.sh +++ b/obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016030301 IS_STABLE=no -## FUNC_BUILD=2016030301 +## FUNC_BUILD=2016030302 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -102,15 +102,15 @@ function Logger { # if [ "$level" == "CRITICAL" ]; then - _Logger "$prefix\e[41m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "ERROR" ]; then - _Logger "$prefix\e[91m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" ERROR_ALERT=1 return elif [ "$level" == "WARN" ]; then - _Logger "$prefix\e[93m$level:$value\e[0m" "$prefix$value" + _Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" WARN_ALERT=1 return elif [ "$level" == "NOTICE" ]; then