Rebuilt targets
This commit is contained in:
parent
11bd517982
commit
ee8b213894
|
@ -41,7 +41,7 @@ IS_STABLE=yes
|
|||
|
||||
|
||||
_OFUNCTIONS_VERSION=2.1.4-dev
|
||||
_OFUNCTIONS_BUILD=2017052803
|
||||
_OFUNCTIONS_BUILD=2017052804
|
||||
_OFUNCTIONS_BOOTSTRAP=true
|
||||
|
||||
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
|
||||
|
@ -364,9 +364,12 @@ function KillChilds {
|
|||
KillChilds "$child" true
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
|
||||
if [ "$self" == true ]; then
|
||||
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
|
||||
if [ "$self" == true ]; then
|
||||
# We need to check for pid again because it may have disappeared after recursive function call
|
||||
if kill -0 "$pid" > /dev/null 2>&1; then
|
||||
kill -s TERM "$pid"
|
||||
Logger "Sent SIGTERM to process [$pid]." "DEBUG"
|
||||
if [ $? != 0 ]; then
|
||||
|
|
9
osync.sh
9
osync.sh
|
@ -10,7 +10,7 @@ IS_STABLE=yes
|
|||
|
||||
|
||||
_OFUNCTIONS_VERSION=2.1.4-dev
|
||||
_OFUNCTIONS_BUILD=2017052803
|
||||
_OFUNCTIONS_BUILD=2017052804
|
||||
_OFUNCTIONS_BOOTSTRAP=true
|
||||
|
||||
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
|
||||
|
@ -317,9 +317,12 @@ function KillChilds {
|
|||
KillChilds "$child" true
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
|
||||
if [ "$self" == true ]; then
|
||||
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
|
||||
if [ "$self" == true ]; then
|
||||
# We need to check for pid again because it may have disappeared after recursive function call
|
||||
if kill -0 "$pid" > /dev/null 2>&1; then
|
||||
kill -s TERM "$pid"
|
||||
Logger "Sent SIGTERM to process [$pid]." "DEBUG"
|
||||
if [ $? != 0 ]; then
|
||||
|
|
Loading…
Reference in New Issue