From 38585ea4a1789e8249cf291a823c7b771c30fbd9 Mon Sep 17 00:00:00 2001 From: Jiangtao Hu Date: Tue, 26 Dec 2017 09:15:01 -0800 Subject: [PATCH] script: wait for dreamview and monitor to start in bootstrap. --- scripts/bootstrap.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index af4ee745ff..e75528cc84 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -29,18 +29,23 @@ function start() { if [ "$HOSTNAME" == "in_release_docker" ]; then supervisord -c /apollo/modules/tools/supervisord/release.conf >& /tmp/supervisord.start.log echo "Started supervisord with release conf" + supervisorctl start monitor > /dev/null + supervisorctl start dreamview > /dev/null else supervisord -c /apollo/modules/tools/supervisord/dev.conf >& /tmp/supervisord.start.log echo "Started supervisord with dev conf" + bash scripts/dreamview.sh fi - supervisorctl start monitor > /dev/null 2>&1 & - supervisorctl start dreamview > /dev/null 2>&1 & echo "Dreamview is running at http://localhost:8888" } function stop() { - supervisorctl stop monitor > /dev/null 2>&1 & - supervisorctl stop dreamview > /dev/null 2>&1 & + if [ "$HOSTNAME" == "in_release_docker" ]; then + supervisorctl stop monitor > /dev/null 2>&1 & + supervisorctl stop dreamview > /dev/null 2>&1 & + else + bash scripts/dreamview.sh stop + fi pkill -f roscore } -- GitLab