openstack/devstack
Code Issues Proposed changes

Rollback workaround for Marconi

Browse Source 
This patch rollsback the stderr redirection in Marconi.

Change-Id: Iaa2d897295cf2bc2e4a8c370d3e0592def337c78
This commit is contained in:
Malini Kamalambal 2014-03-14 12:22:18 -04:00
parent 1fef36e526
commit 380587bde6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/marconi
View File

@ -154,7 +154,7 @@ function install_marconiclient {
# start_marconi() - Start running processes, including screen # start_marconi() - Start running processes, including screen
function start_marconi { function start_marconi {
screen_it marconi-server "marconi-server --config-file $MARCONI_CONF 2>&1" screen_it marconi-server "marconi-server --config-file $MARCONI_CONF"
echo "Waiting for Marconi to start..." 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 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" die $LINENO "Marconi did not start"