From 05b72e7025d9a03814ee25521a8b18938f69efd7 Mon Sep 17 00:00:00 2001
From: Feng Shengqin <feng.shengqin@zte.com.cn>
Date: Mon, 20 Mar 2017 16:37:53 +0800
Subject: [PATCH] Optimize the devstack setup for wsgi deployment

1. Rename zun_error.log to zun_api.log
2. Start the zun-api and create two tabs in devstack screen:
the first tab is for taling the zun_api.log, the second tab
is for tailing the zun_access.log

Change-Id: I10a75c09e7a577615c331ceb0f422375443afeee
Closes-Bug: #1674028
---
 devstack/lib/zun              | 3 ++-
 etc/apache2/zun.conf.template | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index f86cd9a2e..733811654 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -408,7 +408,8 @@ function start_zun_api {
     if [ -f ${enabled_site_file} ] && [ "$ZUN_USE_MOD_WSGI" == "True" ]; then
         enable_apache_site zun
         restart_apache_server
-        tail_log zun-api /var/log/$APACHE_NAME/zun_access.log
+        tail_log zun-api-access /var/log/$APACHE_NAME/zun_access.log
+        tail_log zun-api /var/log/$APACHE_NAME/zun_api.log
     else
         run_process zun-api "$ZUN_BIN_DIR/zun-api"
     fi
diff --git a/etc/apache2/zun.conf.template b/etc/apache2/zun.conf.template
index 49a900a1a..9c8c5973e 100644
--- a/etc/apache2/zun.conf.template
+++ b/etc/apache2/zun.conf.template
@@ -27,7 +27,7 @@ Listen %PUBLICPORT%
     WSGIScriptAlias / %PUBLICWSGI%
     WSGIProcessGroup zun-api
 
-    ErrorLog /var/log/%APACHE_NAME%/zun_error.log
+    ErrorLog /var/log/%APACHE_NAME%/zun_api.log
     LogLevel info
     CustomLog /var/log/%APACHE_NAME%/zun_access.log combined