[bitbake-devel] [PATCH 2/3] toaster: bin/toaster Add ability to specify port and address to bind to
Elliot Smith
elliot.smith at intel.com
Thu Apr 21 13:22:05 UTC 2016
From: Michael Wood <michael.g.wood at intel.com>
Allow binding to a specified address and port to start the django
development server on.
Remove the assumption that you want to bind to 0.0.0.0 and set the
default to localhost.
Add some additional help text after Toaster webserver has started
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
---
bitbake/bin/toaster | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 2d07255..9540fc9 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -69,7 +69,7 @@ webserverStartAll()
echo "Starting webserver..."
- $MANAGE runserver "0.0.0.0:$WEB_PORT" \
+ $MANAGE runserver "$ADDR_PORT" \
</dev/null >>${BUILDDIR}/toaster_web.log 2>&1 \
& echo $! >${BUILDDIR}/.toastermain.pid
@@ -79,7 +79,8 @@ webserverStartAll()
retval=1
rm "${BUILDDIR}/.toastermain.pid"
else
- echo "Webserver address: http://0.0.0.0:$WEB_PORT/"
+ echo "Toaster development webserver started at http://$ADDR_PORT"
+ echo -e "\nYou can now run 'bitbake <target>' on the command line and monitor your build in Toaster.\nYou can also use a Toaster project to configure and run a build.\n"
fi
return $retval
@@ -180,7 +181,7 @@ fi
export TOASTER_DIR=`pwd`
WEBSERVER=1
-WEB_PORT="8000"
+ADDR_PORT="localhost:8000"
unset CMD
for param in $*; do
case $param in
@@ -194,7 +195,14 @@ for param in $*; do
CMD=$param
;;
webport=*)
- WEB_PORT="${param#*=}"
+ ADDR_PORT="${param#*=}"
+ # Split the addr:port string
+ ADDR=`echo $ADDR_PORT | cut -f 1 -d ':'`
+ PORT=`echo $ADDR_PORT | cut -f 2 -d ':'`
+ # If only a port has been speified then set address to localhost.
+ if [ $ADDR = $PORT ] ; then
+ ADDR_PORT="localhost:$PORT"
+ fi
;;
*)
echo "$HELP"
@@ -247,7 +255,7 @@ case $CMD in
start )
# check if addr:port is not in use
if [ "$CMD" == 'start' ]; then
- $MANAGE checksocket "0.0.0.0:$WEB_PORT" || return 1
+ $MANAGE checksocket "$ADDR_PORT" || return 1
fi
# kill Toaster web server if it's alive
--
1.9.3
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the bitbake-devel
mailing list