openstack/devstack
Code Issues Proposed changes

Merge "Use daemon flag only when USE_SCREEN=False"

Browse Source
This commit is contained in:
Jenkins 2014-05-20 19:38:41 +00:00 committed by Gerrit Code Review
commit 740822b18b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/marconi
View File

@ -154,7 +154,12 @@ function install_marconiclient {
# start_marconi() - Start running processes, including screen
function start_marconi {
screen_it marconi-server "marconi-server --config-file $MARCONI_CONF --daemon"
if [[ ${USE_SCREEN,,} == "false" ]];; then
screen_it marconi-server "marconi-server --config-file $MARCONI_CONF --daemon"
else
screen_it marconi-server "marconi-server --config-file $MARCONI_CONF"
fi
echo "Waiting for Marconi to start..."
if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q -O- $MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT/v1/health; do sleep 1; done"; then
die $LINENO "Marconi did not start"