bitbake: toaster: move startup checks to a better place
Moved addr:port, bitbake.lock and toastermain.pid checks to the place where the rest of Toaster starting happens. (Bitbake rev: 0e7812b5512e609ea815db30be1d7caca896ab60) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
064d2c7984
commit
b194c0c00a
|
@ -288,36 +288,33 @@ fi
|
||||||
|
|
||||||
echo "The system will $CMD."
|
echo "The system will $CMD."
|
||||||
|
|
||||||
# check if addr:port is not in use
|
|
||||||
if [ "$CMD" == 'start' ]; then
|
|
||||||
$MANAGE checksocket "0.0.0.0:$WEB_PORT" || return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Make sure it's safe to run by checking bitbake lock
|
|
||||||
|
|
||||||
lock=1
|
|
||||||
if [ -e $BUILDDIR/bitbake.lock ]; then
|
|
||||||
python -c "import fcntl; fcntl.flock(open(\"$BUILDDIR/bitbake.lock\"), fcntl.LOCK_EX|fcntl.LOCK_NB)" 2>/dev/null || lock=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ${CMD} = 'start' ] && [ $lock -eq 0 ]; then
|
|
||||||
echo "Error: bitbake lock state error. File locks show that the system is on." 1>&2
|
|
||||||
echo "Please wait for the current build to finish, stop and then start the system again." 1>&2
|
|
||||||
return 3
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ${CMD} = 'start' ] && [ -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
|
|
||||||
|
|
||||||
|
|
||||||
# Execute the commands
|
# Execute the commands
|
||||||
|
|
||||||
case $CMD in
|
case $CMD in
|
||||||
start )
|
start )
|
||||||
|
# check if addr:port is not in use
|
||||||
|
if [ "$CMD" == 'start' ]; then
|
||||||
|
$MANAGE checksocket "0.0.0.0:$WEB_PORT" || return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make sure it's safe to start by checking bitbake lock
|
||||||
|
if [ -e $BUILDDIR/bitbake.lock ]; then
|
||||||
|
python -c "import fcntl; fcntl.flock(open(\"$BUILDDIR/bitbake.lock\"), fcntl.LOCK_EX|fcntl.LOCK_NB)" 2>/dev/null
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
echo "Error: bitbake lock state error. File locks show that the system is on." 1>&2
|
||||||
|
echo "Please wait for the current build to finish, stop and then start the system again." 1>&2
|
||||||
|
return 3
|
||||||
|
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
|
# Create configuration file
|
||||||
conf=${BUILDDIR}/conf/toaster.conf
|
conf=${BUILDDIR}/conf/toaster.conf
|
||||||
echo "# Created by toaster start script" > $conf
|
echo "# Created by toaster start script" > $conf
|
||||||
|
|
Loading…
Reference in New Issue