From 1c237ea530868363e02a67ba3566b81813fa2f37 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Mon, 7 Sep 2015 11:29:11 +0200 Subject: [PATCH] Let devstack redirect output Instead of daemonizing processes ourselves, let devstack take care of that so that logging goes to the right place and then it'll be exported and shown in the gate logs. Closes-bug: #1493036 Change-Id: I532ad70dbf20985b8f4d16ea19799d4b832902ae --- devstack/plugin.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 034a9702d..8da301a37 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -119,7 +119,6 @@ function configure_zaqar { iniset $ZAQAR_CONF DEFAULT verbose True iniset $ZAQAR_CONF DEFAULT unreliable True iniset $ZAQAR_CONF DEFAULT admin_mode True - iniset $ZAQAR_CONF DEFAULT use_syslog $SYSLOG iniset $ZAQAR_CONF DEFAULT auth_strategy keystone iniset $ZAQAR_CONF signed_url secret_key notreallysecret @@ -219,13 +218,8 @@ function install_zaqarclient { # start_zaqar() - Start running processes, including screen function start_zaqar { - if [[ "$USE_SCREEN" = "False" ]]; then - run_process zaqar-wsgi "uwsgi --ini $ZAQAR_UWSGI_CONF --daemonize $ZAQAR_API_LOG_DIR/uwsgi.log" - run_process zaqar-websocket "zaqar-server --config-file $ZAQAR_CONF --daemon" - else - run_process zaqar-wsgi "uwsgi --ini $ZAQAR_UWSGI_CONF" - run_process zaqar-websocket "zaqar-server --config-file $ZAQAR_CONF" - fi + run_process zaqar-wsgi "uwsgi --master --ini $ZAQAR_UWSGI_CONF" + run_process zaqar-websocket "zaqar-server --config-file $ZAQAR_CONF" echo "Waiting for Zaqar to start..." token=$(openstack token issue -c id -f value)