diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-05-28 20:26:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 11:41:57 +0100 |
commit | 4c93959c55dcdb48032129b53e0ea75ddd7b1ee6 (patch) | |
tree | 60578476c17aff47b09cc47909bb557298f89279 | |
parent | 7e7ee662f5dea4d090293045f7498093322802cc (diff) | |
download | poky-4c93959c55dcdb48032129b53e0ea75ddd7b1ee6.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: 14079cb1fd497799548c677962d89c02a6d2bf92)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 | ||