[oe-commits] [bitbake] 15/18: toaster: don't kill toaster on start

git at git.openembedded.org git at git.openembedded.org
Tue Sep 6 09:37:50 UTC 2016


rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 0dab45e9815e8939219900264e86f569c714b7c6
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Mon Sep 5 15:29:30 2016 +0100

    toaster: don't kill toaster on start
    
    There is no point of trying to kill django development server
    when toaster starts because 'manage.py checksocket' command is already
    used in the script code to check if development server port is occupied.
    
    Even if Toaster is listening on another port, killing previous instance
    looks quite implicit and doesn't solve anything as there are other
    processes that might be still running.
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 bin/toaster | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bin/toaster b/bin/toaster
index e35bfce..5e01101 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -249,14 +249,6 @@ case $CMD in
             fi
         fi
 
-        # kill Toaster web server if it's alive
-        if [ -e $BUILDDIR/.toastermain.pid ] && kill -0 `cat $BUILDDIR/.toastermain.pid`; then
-            echo "Warning: bitbake appears to be dead, but the Toaster web server is running." 1>&2
-            echo " Something fishy is going on." 1>&2
-            echo "Cleaning up the web server to start from a clean slate."
-            webserverKillAll
-        fi
-
         # Create configuration file
         conf=${BUILDDIR}/conf/local.conf
         line='INHERIT+="toaster buildhistory"'

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list