From 2652a4d9b04a86876b713f501543e3c6ad1727f5 Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Fri, 25 Apr 2014 14:41:55 -0500
Subject: [PATCH] Issue #2629: Update capture to grab Xorg log files.

Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: fd0662eb073edfb9fe7209ee40592f61b5cc5cac [formerly 5fb2aef966086574eba39270e7552370bba4e7f6] [formerly de249decabb8463e67f5eb4dc856f72deb17840d] [formerly fd0662eb073edfb9fe7209ee40592f61b5cc5cac [formerly 5fb2aef966086574eba39270e7552370bba4e7f6] [formerly de249decabb8463e67f5eb4dc856f72deb17840d] [formerly 1cc7977b99c3bb6e023bbe32d4c1fdec836d2b58 [formerly de249decabb8463e67f5eb4dc856f72deb17840d [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]]
Former-commit-id: 1cc7977b99c3bb6e023bbe32d4c1fdec836d2b58
Former-commit-id: 76d5fc88e4701391da47dbfc70e4ee0358e8b06e [formerly 3f668955298bb5a10fc83a8e387793d6d5a67442] [formerly 8adb3a0a5795e22045a287892d0335d8c624a4fe [formerly 7e3d3f3093d219809bdd046b9708d4a0346b726c]]
Former-commit-id: d3cf402b2688a4b9616bd36891bac6b11c859e41 [formerly 92c2f7fa50f9ddb858c99913dd67410ec6ca723f]
Former-commit-id: 3cbb7cb196da06473258f60eb4f33572c68fad3f
---
 .../com.raytheon.uf.tools.cli/impl/capture     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
index 9c6ef5af9b..ad48d8995c 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
@@ -7,6 +7,8 @@ grepString="(/awips2/cave/cave|/usr/local/viz/cave)"
 
 edexGrepString="edex.run.mode="
 
+xorgLogPath="/var/log"
+
 # the remote servers to grab top on.  Use to get general state of servers
 REMOTE_SERVERS_TO_CHECK="${DX_SERVERS}"
 
@@ -30,6 +32,7 @@ GRAB_REMOTE_VMSTAT="Y"
 GRAB_CAVE_AND_ALERTVIZ_LOGS="Y"
 GRAB_SCREENSHOT="Y"
 GRAB_CURRENT_QUERIES="Y"
+GRAB_XORG_LOG="Y"
 EDEX_MODE="N"
 FORCE="N"
 TGZ_OUTPUT="Y"
@@ -150,6 +153,16 @@ grabScreenShot() {
    fi
 }
 
+# runs import to grab screen shot of users desktop
+grabXorgLog() {
+   if [ "$GRAB_XORG_LOG" == "y" ]; then
+      echo "Capturing Xorg logs"
+      t1=`date "+%Y%m%d %H:%M:%S"`
+      echo "${t1}: Capturing Xorg logs" >> $processFile
+      cp ${xorgLogPath}/Xorg*.log* ${dataPath} >> $processFile 2>&1 &
+   fi
+}
+
 # runs ssh command to grab top on a remote server, requires auto login to be setup
 grabRemoteTop() {
    if [ "$GRAB_REMOTE_TOP" == "y" ]; then
@@ -433,6 +446,7 @@ checkYes TGZ_OUTPUT $TGZ_OUTPUT
 checkYes ACCCUM $ACCCUM
 checkYes RUN_VERSIONS $RUN_VERSIONS
 checkYes GRAB_SCREENSHOT $GRAB_SCREENSHOT
+checkYes GRAB_XORG_LOG $GRAB_XORG_LOG
 
 # if PID mode don't grab other hs_err_pids
 if [ ! -z $cavePid ]; then
@@ -451,6 +465,7 @@ if [ "$EDEX_MODE" == "y" ]; then
    MOVE_ALL_HS_ERR_PID="n"
    GRAB_REMOTE_TOP="n"
    GRAB_REMOTE_VMSTAT="n"
+   GRAB_XORG_LOG="n"
 fi
 
 umask 0002
@@ -553,6 +568,9 @@ else
    echo "" >> $processFile
 fi
 
+# grab Xorg logs
+grabXorgLog
+
 # grab top for servers
 grabRemoteTop