From d5b0ec24aa985b8e951b93e373887a282740d37e Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 12 Nov 2014 14:45:05 +1100
Subject: [PATCH] Copy all apache logs into output

In I4b664a1d6c9bbb1ff999158f3a8c8ab3bd8d891b keystone switched to
running as a wsgi app under apache.  Swift and ceilometer etc can also
run under apache and might change one-day.

I strongly suspect failures in
I9f8b703aa7e4f064656141a548bff014be500daf is related to permissions
error in keystone but I can't see any relevant logs.

Rather than try and do things piecemeal which might miss things again
in the future, this copies everything in /var/log/[apache2|httpd] into
the log output.

Change-Id: I13f9ea2fe4501fb75cdb1e9fc059fdefcf38f0c0
---
 functions.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/functions.sh b/functions.sh
index 3d913db0..69ae24ee 100644
--- a/functions.sh
+++ b/functions.sh
@@ -488,23 +488,13 @@ function cleanup_host {
             | sudo tee $BASE/logs/syslog.txt > /dev/null
     fi
 
-    # horizon
+    # apache logs; including wsgi stuff like horizon, keystone, etc.
     if is_ubuntu; then
-        sudo cp /var/log/apache2/horizon_error.log $BASE/logs/horizon_error.log
+        local apache_logs=/var/log/apache2
     elif is_fedora; then
-        sudo cp /var/log/httpd/horizon_error.log $BASE/logs/horizon_error.log
-    fi
-
-    # apache2
-    if is_ubuntu; then
-        if [ -f /var/log/apache2/error.log ] ; then
-            sudo cp /var/log/apache2/error.log $BASE/logs/apache2_error.log
-        fi
-    elif is_fedora; then
-        if [ -f /var/log/httpd/error.log ] ; then
-            sudo cp /var/log/httpd/error.log $BASE/logs/apache2_error.log
-        fi
+        local apache_logs=/var/log/httpd
     fi
+    sudo cp -r ${apache_logs} $BASE/logs/apache
 
     # rabbitmq logs
     if [ -d /var/log/rabbitmq ]; then