Merge "Issue #2629: Update capture to grab Xorg log files." into development

Former-commit-id: 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 9a46583271 [formerly 4842f08165 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: a847ecddfa [formerly 1d6014f363] [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20]]
Former-commit-id: 94e69def4d9c026f69b3aa3df39355f486b5e5fe [formerly ac0b4dc1f2]
Former-commit-id: 8f87fdc431

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