From f5dfc478a2844b9d3ff4b7e6f21395087db0d00d Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 10 Apr 2016 21:11:59 +0200 Subject: [PATCH] Fixed bogus debug line in Killchilds --- dev/debug_obackup.sh | 19 +++++++++---------- dev/ofunctions.sh | 19 +++++++++---------- obackup.sh | 19 +++++++++---------- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index bd55116..b892444 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016040603 IS_STABLE=no -## FUNC_BUILD=2016040802 +## FUNC_BUILD=2016041001 ## 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 @@ -157,21 +157,20 @@ function KillChilds { if children="$(pgrep -P "$pid")"; then for child in $children; do + Logger "Launching KillChilds \"$child\" true" "DEBUG" KillChilds "$child" true done fi # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing if [ "$self" == true ]; then - if [ "$_DEBUG" == "yes" ]; then - Logger "Killing process $pid" "NOTICE" - kill -s SIGTERM "$pid" - if [ $? != 0 ]; then - sleep 15 && kill -9 "$pid" & - return 1 - else - return 0 - fi + Logger "Killing process $pid" "DEBUG" + kill -s SIGTERM "$pid" + if [ $? != 0 ]; then + sleep 15 && kill -9 "$pid" & + return 1 + else + return 0 fi fi # sleep 15 needs to wait before killing itself diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 684c6aa..8d375a4 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -1,4 +1,4 @@ -## FUNC_BUILD=2016040802 +## FUNC_BUILD=2016041001 ## 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 @@ -147,21 +147,20 @@ function KillChilds { if children="$(pgrep -P "$pid")"; then for child in $children; do + Logger "Launching KillChilds \"$child\" true" "DEBUG" KillChilds "$child" true done fi # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing if [ "$self" == true ]; then - if [ "$_DEBUG" == "yes" ]; then - Logger "Killing process $pid" "NOTICE" - kill -s SIGTERM "$pid" - if [ $? != 0 ]; then - sleep 15 && kill -9 "$pid" & - return 1 - else - return 0 - fi + Logger "Killing process $pid" "DEBUG" + kill -s SIGTERM "$pid" + if [ $? != 0 ]; then + sleep 15 && kill -9 "$pid" & + return 1 + else + return 0 fi fi # sleep 15 needs to wait before killing itself diff --git a/obackup.sh b/obackup.sh index 8ab75d2..8b9688c 100755 --- a/obackup.sh +++ b/obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016040603 IS_STABLE=no -## FUNC_BUILD=2016040802 +## FUNC_BUILD=2016041001 ## 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 @@ -147,21 +147,20 @@ function KillChilds { if children="$(pgrep -P "$pid")"; then for child in $children; do + Logger "Launching KillChilds \"$child\" true" "DEBUG" KillChilds "$child" true done fi # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing if [ "$self" == true ]; then - if [ "$_DEBUG" == "yes" ]; then - Logger "Killing process $pid" "NOTICE" - kill -s SIGTERM "$pid" - if [ $? != 0 ]; then - sleep 15 && kill -9 "$pid" & - return 1 - else - return 0 - fi + Logger "Killing process $pid" "DEBUG" + kill -s SIGTERM "$pid" + if [ $? != 0 ]; then + sleep 15 && kill -9 "$pid" & + return 1 + else + return 0 fi fi # sleep 15 needs to wait before killing itself