diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-02-15 20:26:02 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-28 12:52:34 +0100 |
commit | 844314844eccaf2ddca4ed4fcf5a4aa9328509b0 (patch) | |
tree | 11a1d342d61e65fe79aae97dc8f3284c88522020 /bitbake | |
parent | 2f110a55dc603f8832702c1e33c1e88efe98a84e (diff) | |
download | poky-844314844eccaf2ddca4ed4fcf5a4aa9328509b0.tar.gz |
bitbake: Toaster: fix shutdown and extra threads
Fix typo in shutdown code to kill threads when "kill -0" is not enough.
Use the '--noreload' flag for 'runserver' so that there are no extra
and unaccounted threads.
[YOCTO #12555]
(Bitbake rev: 256990943075e89cb9aee2bc6488344b6783e07b)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-x | bitbake/bin/toaster | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 4036f0ad58..ed365ee82e 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -68,7 +68,7 @@ webserverKillAll() | |||
68 | if [ -f ${pidfile} ]; then | 68 | if [ -f ${pidfile} ]; then |
69 | pid=`cat ${pidfile}` | 69 | pid=`cat ${pidfile}` |
70 | while kill -0 $pid 2>/dev/null; do | 70 | while kill -0 $pid 2>/dev/null; do |
71 | kill -SIGTERM -$pid 2>/dev/null | 71 | kill -SIGTERM $pid 2>/dev/null |
72 | sleep 1 | 72 | sleep 1 |
73 | done | 73 | done |
74 | rm ${pidfile} | 74 | rm ${pidfile} |
@@ -91,7 +91,7 @@ webserverStartAll() | |||
91 | 91 | ||
92 | echo "Starting webserver..." | 92 | echo "Starting webserver..." |
93 | 93 | ||
94 | $MANAGE runserver "$ADDR_PORT" \ | 94 | $MANAGE runserver --noreload "$ADDR_PORT" \ |
95 | </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \ | 95 | </dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \ |
96 | & echo $! >${BUILDDIR}/.toastermain.pid | 96 | & echo $! >${BUILDDIR}/.toastermain.pid |
97 | 97 | ||