From db00fe17e0675e0f8d3bf891b189ef6cdfd066ed Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 11 Feb 2013 11:03:03 -0800
Subject: [PATCH] Recapture screen service logs; disable sysloging.

Using syslog as the single point of OpenStack service data when running
devstack-gate is clunky. Exception tracebacks are compressed into a
single line making it hard to read what broke. Return to capturing
individual screen logs, but don't duplicate those logs to syslog
anymore.

Change-Id: I17e31b4ffde00bb57f70129710c1b6bb1584a5fa
---
 devstack-vm-gate-wrap.sh | 2 ++
 devstack-vm-gate.sh      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index e5e63f35..35639411 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -248,6 +248,7 @@ function cleanup_host {
       mkdir -p $WORKSPACE/logs/old/
       mkdir -p $WORKSPACE/logs/new/
       mkdir -p $WORKSPACE/logs/grenade/
+      sudo cp $BASE/old/screen-logs/* $WORKSPACE/logs/old/
       sudo cp $BASE/old/devstacklog.txt $WORKSPACE/logs/old/
       sudo cp $BASE/old/devstack/localrc $WORKSPACE/logs/old/localrc.txt
       sudo cp $BASE/logs/* $WORKSPACE/logs/
@@ -256,6 +257,7 @@ function cleanup_host {
     else
       NEWLOGTARGET=$WORKSPACE/logs
     fi
+    sudo cp $BASE/new/screen-logs/* $NEWLOGTARGET/
     sudo cp $BASE/new/devstacklog.txt $NEWLOGTARGET/
     sudo cp $BASE/new/devstack/localrc $NEWLOGTARGET/localrc.txt
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 181fc2d3..e15659ff 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -78,7 +78,8 @@ ERROR_ON_CLONE=True
 ENABLED_SERVICES=$ENABLED_SERVICES
 SKIP_EXERCISES=$SKIP_EXERCISES
 SERVICE_HOST=127.0.0.1
-SYSLOG=True
+# Screen console logs will capture service logs.
+SYSLOG=False
 SCREEN_LOGDIR=$BASE/new/screen-logs
 LOGFILE=$BASE/new/devstacklog.txt
 VERBOSE=True