WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuilt targets

This commit is contained in:
deajan 2017-05-28 21:25:22 +02:00
parent c2b24688ef
commit 1400390f57
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dev/debug_osync.sh
View File

@ -41,7 +41,7 @@ IS_STABLE=yes
_OFUNCTIONS_VERSION=2.1.4-dev _OFUNCTIONS_VERSION=2.1.4-dev
_OFUNCTIONS_BUILD=2017052802 _OFUNCTIONS_BUILD=2017052803
_OFUNCTIONS_BOOTSTRAP=true _OFUNCTIONS_BOOTSTRAP=true
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
@ -352,21 +352,21 @@ function KillChilds {
return 1 return 1
fi fi
# Warning: pgrep does not exist in cygwin, have this checked in CheckEnvironment if kill -0 "$pid" > /dev/null 2>&1; then
if children="$(pgrep -P "$pid")"; then # Warning: pgrep does not exist in cygwin, have this checked in CheckEnvironment
if [[ "$pid" == *"$children"* ]]; then if children="$(pgrep -P "$pid")"; then
Logger "Bogus pgrep implementation." "CRITICAL" if [[ "$pid" == *"$children"* ]]; then
children="${children/$pid/}" Logger "Bogus pgrep implementation." "CRITICAL"
children="${children/$pid/}"
fi
for child in $children; do
Logger "Launching KillChilds \"$child\" true" "DEBUG" #__WITH_PARANOIA_DEBUG
KillChilds "$child" true
done
fi fi
for child in $children; do
Logger "Launching KillChilds \"$child\" true" "DEBUG" #__WITH_PARANOIA_DEBUG
KillChilds "$child" true
done
fi
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
if [ "$self" == true ]; then if [ "$self" == true ]; then
if kill -0 "$pid" > /dev/null 2>&1; then
kill -s TERM "$pid" kill -s TERM "$pid"
Logger "Sent SIGTERM to process [$pid]." "DEBUG" Logger "Sent SIGTERM to process [$pid]." "DEBUG"
if [ $? != 0 ]; then if [ $? != 0 ]; then

26
osync.sh
View File

@ -10,7 +10,7 @@ IS_STABLE=yes
_OFUNCTIONS_VERSION=2.1.4-dev _OFUNCTIONS_VERSION=2.1.4-dev
_OFUNCTIONS_BUILD=2017052802 _OFUNCTIONS_BUILD=2017052803
_OFUNCTIONS_BOOTSTRAP=true _OFUNCTIONS_BOOTSTRAP=true
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
@ -306,20 +306,20 @@ function KillChilds {
return 1 return 1
fi fi
# Warning: pgrep does not exist in cygwin, have this checked in CheckEnvironment if kill -0 "$pid" > /dev/null 2>&1; then
if children="$(pgrep -P "$pid")"; then # Warning: pgrep does not exist in cygwin, have this checked in CheckEnvironment
if [[ "$pid" == *"$children"* ]]; then if children="$(pgrep -P "$pid")"; then
Logger "Bogus pgrep implementation." "CRITICAL" if [[ "$pid" == *"$children"* ]]; then
children="${children/$pid/}" Logger "Bogus pgrep implementation." "CRITICAL"
children="${children/$pid/}"
fi
for child in $children; do
KillChilds "$child" true
done
fi fi
for child in $children; do
KillChilds "$child" true
done
fi
# Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
if [ "$self" == true ]; then if [ "$self" == true ]; then
if kill -0 "$pid" > /dev/null 2>&1; then
kill -s TERM "$pid" kill -s TERM "$pid"
Logger "Sent SIGTERM to process [$pid]." "DEBUG" Logger "Sent SIGTERM to process [$pid]." "DEBUG"
if [ $? != 0 ]; then if [ $? != 0 ]; then