openstack/mistral
Code Issues Proposed changes

Merge "Clean up screen and tail_log references"

Browse Source
This commit is contained in:
Jenkins 2017-09-08 10:59:23 +00:00 committed by Gerrit Code Review
commit fdaec7edd3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -155,7 +155,7 @@ function install_mistral_pythonclient {
} }
# start_mistral - Start running processes, including screen # start_mistral - Start running processes
function start_mistral { function start_mistral {
# If the site is not enabled then we are in a grenade scenario # If the site is not enabled then we are in a grenade scenario
local enabled_site_file local enabled_site_file
@ -166,7 +166,6 @@ function start_mistral {
if [ -f ${enabled_site_file} ] && [ "$MISTRAL_USE_MOD_WSGI" == "True" ]; then if [ -f ${enabled_site_file} ] && [ "$MISTRAL_USE_MOD_WSGI" == "True" ]; then
enable_apache_site mistral-api enable_apache_site mistral-api
restart_apache_server restart_apache_server
tail_log mistral-api /var/log/$APACHE_NAME/mistral_api.log
else else
run_process mistral-api "$MISTRAL_BIN_DIR/mistral-server --server api --config-file $MISTRAL_CONF_DIR/mistral.conf" run_process mistral-api "$MISTRAL_BIN_DIR/mistral-server --server api --config-file $MISTRAL_CONF_DIR/mistral.conf"
fi fi
@ -182,7 +181,6 @@ function start_mistral {
# stop_mistral - Stop running processes # stop_mistral - Stop running processes
function stop_mistral { function stop_mistral {
# Kill the Mistral screen windows
local serv local serv
for serv in mistral mistral-engine mistral-executor mistral-event-engine; do for serv in mistral mistral-engine mistral-executor mistral-event-engine; do
stop_process $serv stop_process $serv