mirror of
https://github.com/troglobit/finit.git
synced 2026-11-02 13:20:32 +00:00
test: reindent, don't warn on PID 0
PID 0 for a collected task is not a bug, 1 or < 0 is a bug. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
11946f12d3
commit
efed0db16b
1 file changed
+32
-31
+32
-31
@@ -2,50 +2,51 @@
|
|||||||
|
|
||||||
nm=$1
|
nm=$1
|
||||||
|
|
||||||
# shellcheck disable=SC2046
|
|
||||||
getpid()
|
getpid()
|
||||||
{
|
{
|
||||||
initctl status "$1" |awk '/PID :/{ print $3; }'
|
initctl status "$1" |awk '/PID :/{ print $3; }'
|
||||||
}
|
}
|
||||||
|
|
||||||
pid=$(getpid "$nm")
|
pid=$(getpid "$nm")
|
||||||
if [ -f oldpid ]; then
|
if [ -f oldpid ]; then
|
||||||
oldpid=$(cat oldpid)
|
oldpid=$(cat oldpid)
|
||||||
|
if [ "$oldpid" = "$pid" ]; then
|
||||||
|
echo "Looks bad, wait for it ..."
|
||||||
|
sleep 3
|
||||||
|
pid=$(getpid "$nm")
|
||||||
if [ "$oldpid" = "$pid" ]; then
|
if [ "$oldpid" = "$pid" ]; then
|
||||||
echo "Looks bad, wait for it ..."
|
echo "Finit did not deregister old PID $oldpid vs $pid"
|
||||||
sleep 3
|
initctl status "$nm"
|
||||||
pid=$(getpid "$nm")
|
ps
|
||||||
if [ "$oldpid" = "$pid" ]; then
|
echo "Reloading finit ..."
|
||||||
echo "Finit did not deregister old PID $oldpid vs $pid"
|
initctl reload
|
||||||
initctl status "$nm"
|
sleep 1
|
||||||
ps
|
initctl status "$nm"
|
||||||
echo "Reloading finit ..."
|
exit 1
|
||||||
initctl reload
|
|
||||||
sleep 1
|
|
||||||
initctl status "$nm"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
timeout=50
|
timeout=50
|
||||||
while [ "$pid" -le 1 ]; do
|
while [ "$pid" -le 1 ]; do
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
pid=$(getpid "$nm")
|
pid=$(getpid "$nm")
|
||||||
if [ "$pid" -le 1 ]; then
|
if [ "$pid" -le 1 ]; then
|
||||||
timeout=$((timeout - 1))
|
timeout=$((timeout - 1))
|
||||||
if [ "$timeout" -gt 0 ]; then
|
if [ "$timeout" -gt 0 ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Got a bad PID: $pid, aborting ..."
|
|
||||||
ps
|
|
||||||
sleep 1
|
|
||||||
initctl status "$nm"
|
|
||||||
ps
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
break
|
|
||||||
|
if [ $pid -ne 0 ]; then
|
||||||
|
echo "Got a bad PID: $pid, aborting ..."
|
||||||
|
ps
|
||||||
|
sleep 1
|
||||||
|
initctl status "$nm"
|
||||||
|
ps
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
break
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "$pid" > /tmp/oldpid
|
echo "$pid" > /tmp/oldpid
|
||||||
|
|||||||
Reference in new issue
Block a user