From: Alexander Barton <alex@barton.de>
Date: Fri, 28 Oct 2011 09:57:34 +0000 (+0200)
Subject: DiskErrors.tst: same grep expressions for reboot/no-reboot case
X-Git-Tag: rel-3~4
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=commitdiff_plain;h=bfe39e81e611374fa2b72ac50824e88bb7e2abc3

DiskErrors.tst: same grep expressions for reboot/no-reboot case
---

diff --git a/client/lib/tests/Darwin/DiskErrors.tst b/client/lib/tests/Darwin/DiskErrors.tst
index 2556581..40df360 100644
--- a/client/lib/tests/Darwin/DiskErrors.tst
+++ b/client/lib/tests/Darwin/DiskErrors.tst
@@ -5,22 +5,25 @@
 
 SERVICE="Disks_p"
 
+grepcmd='grep -i "I/O" | grep -i error | grep -v nagcollect
+ | grep -v "com.apple.mdworker.pool"
+ | grep -v "file i/o error - bad dset location"
+ | grep -v "encoder error"
+'
+
 offset=`LC_ALL=C grep -b "BOOT_TIME:" /var/log/system.log \
  | tail -n 1 | cut -d':' -f1`
 [ -n "$offset" ] || offset=`LC_ALL=C grep -b -- --NagiosReset-- \
  /var/log/system.log | tail -n 1 | cut -d':' -f1`
+
 if [ -n "$offset" ]; then
 	# reboot detected in system.log
 	error=`LC_ALL=C tail -c "+$offset" /var/log/system.log \
-	 | grep -i "I/O" | grep -i error | grep -v nagcollect \
-	 | grep -v "com.apple.mdworker.pool" \
-	 | grep -v "file i/o error - bad dset location" \
-	 | grep -v "encoder error" \
-	 | tail -n 1`
+	 | eval $grepcmd | tail -n 1`
 else
 	# no reboot detected in system.log
 	error=`LC_ALL=C grep -i "I/O" /var/log/system.log \
-	 | grep -i error | grep -v nagcollect | tail -n 1`
+	 | eval $grepcmd | tail -n 1`
 fi
 if [ -n "$error" ]; then
 	msg=`echo $error | cut -d' ' -f6-`