File 0003-high-hb_report-Always-prefer-syslog-if-ava... of Package cluster-glue

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch of Package cluster-glue (Revision b8d911320a93d4d0ac60af9b4f242670)

Currently displaying revision b8d911320a93d4d0ac60af9b4f242670 , Show latest

commit 395dad096f401deeec3bca80c3f9db7a38128a53
Author: Kristoffer Grönlund <krig@koru.se>
Date:   Tue Aug 25 14:47:15 2015 +0200

high: hb_report: Always prefer syslog if available (bsc#942906)

diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index 07ab23c..b228665 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -295,10 +295,6 @@ logmark() {
 #
 findlog() {
 	local logf=""
-	if [ -f "$PCMK_LOG" ]; then
-		echo $PCMK_LOG
-		return
-	fi
 
 	if [ "$HA_LOGFACILITY" ]; then
 		logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
@@ -308,13 +304,16 @@ findlog() {
 		return
 	fi
 
-
-	collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
 	if [ -f "$WORKDIR/$JOURNAL_F" ]; then
 		echo $WORKDIR/$JOURNAL_F
 		return
 	fi
 
+	if [ -f "$PCMK_LOG" ]; then
+		echo $PCMK_LOG
+		return
+	fi
+
 	echo ${HA_DEBUGFILE:-$HA_LOGFILE}
 	[ "${HA_DEBUGFILE:-$HA_LOGFILE}" ] &&
 		debug "will try with ${HA_DEBUGFILE:-$HA_LOGFILE}"
@@ -1051,6 +1050,9 @@ getlog() {
 	local outf
 	outf=$WORKDIR/$HALOG_F
 
+	# collect journal from systemd
+	collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+
 	if [ "$HA_LOG" ]; then  # log provided by the user?
 		[ -f "$HA_LOG" ] || {  # not present
 			is_collector ||  # warning if not on slave
diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh
index 1f16967..ff54df8 100644
--- a/hb_report/utillib.sh
+++ b/hb_report/utillib.sh
@@ -118,22 +118,14 @@ findmsg() {
 	mark=$1
 	log=""
 
-	if [ -f /var/log/pacemaker.log ]; then
-		log=`grep -l -e "$mark" /var/log/pacemaker.log`
-		if [ ! "$log" ]; then
-			log=`grep -l -e "$mark" /var/log/pacemaker.log*` && break
-		fi
-	fi
+	for d in $syslogdirs; do
+		[ -d $d ] || continue
+		log=`grep -l -e "$mark" $d/$favourites` && break
+		test "$log" && break
+		log=`grep -l -e "$mark" $d/*` && break
+		test "$log" && break
+	done 2>/dev/null
 
-	if [ ! "$log" ]; then
-		for d in $syslogdirs; do
-			[ -d $d ] || continue
-			log=`grep -l -e "$mark" $d/$favourites` && break
-			test "$log" && break
-			log=`grep -l -e "$mark" $d/*` && break
-			test "$log" && break
-		done 2>/dev/null
-	fi
 	[ "$log" ] &&
 		ls -t $log | tr '\n' ' '
 	[ "$log" ] &&

Places

File 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch of Package cluster-glue (Revision b8d911320a93d4d0ac60af9b4f242670)

Places