From 966463c802c6c2f3a04da812cd689502aa8006cd Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Thu, 21 Aug 2014 18:24:42 -0500
Subject: [PATCH] Keystone access log in key-access screen

When Keystone was run in Apache Httpd the access log wasn't in a
screen. A new screen called key-access is now started with
Keystone's access log.

Change-Id: Ie1f4d4b679e1b9c87f0cea37deb25f7b6636fe01
Closes-Bug: #1359995
---
 functions-common | 1 +
 lib/keystone     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/functions-common b/functions-common
index c09666458f..742f2ae07e 100644
--- a/functions-common
+++ b/functions-common
@@ -1596,6 +1596,7 @@ function is_service_enabled {
         [[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && enabled=0
         [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0
         [[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0
+        [[ ${service} == key-* && ${ENABLED_SERVICES} =~ "key" ]] && enabled=0
     done
     $xtrace
     return $enabled
diff --git a/lib/keystone b/lib/keystone
index c6e17cad73..0e3b46d97b 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -468,6 +468,7 @@ function start_keystone {
     if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
         restart_apache_server
         screen_it key "cd $KEYSTONE_DIR && sudo tail -f /var/log/$APACHE_NAME/keystone.log"
+        screen_it key-access "sudo tail -f /var/log/$APACHE_NAME/keystone_access.log"
     else
         # Start Keystone in a screen window
         screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF --debug"