Skip to content

Commit

Permalink
Rollback workaround for Marconi
Browse files Browse the repository at this point in the history
This patch rollsback the stderr redirection in Marconi.

Change-Id: Iaa2d897295cf2bc2e4a8c370d3e0592def337c78
  • Loading branch information
Malini Kamalambal committed Mar 14, 2014
1 parent 1fef36e commit 380587b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/marconi
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function install_marconiclient {

# start_marconi() - Start running processes, including screen
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..."
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"
Expand Down

0 comments on commit 380587b

Please sign in to comment.