From db47e1d47216a99e1d422f623ccb9c104b0f8e30 Mon Sep 17 00:00:00 2001
From: Eric Renfro <eric.renfro@bookit.com>
Date: Mon, 8 Jul 2013 08:56:03 -0400
Subject: [PATCH] Fixed runtrap and added runtrap.debug

---
 runtrap       | 23 ++++++++++++++++-------
 runtrap.debug |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 120000 runtrap.debug

diff --git a/runtrap b/runtrap
index be93012..583505a 100755
--- a/runtrap
+++ b/runtrap
@@ -6,6 +6,11 @@ lockfile="/tmp/zabbix.trap.${state}.lock"
 tempfile=$(mktemp /tmp/zabbix.trap.${state}.tmp.XXXXXXXXXX)
 trapdir="$(dirname $(readlink -f $0))/trap.d/${state}"
 errors=0
+debug=false
+
+if [[ "$0" == *".debug" ]]; then
+	debug=true
+fi
 
 if [[ ! -d "$trapdir" ]]; then
 	echo "ERROR: Trap directory doesn't exist: $trapdir "
@@ -34,7 +39,7 @@ fi
 echo 1 > ${lockfile}
 for s in ${trapdir}/*
 do
-        $s > ${tempfile} 2> /dev/null
+        $s >> ${tempfile} 2> /dev/null
         if [ $? -ne 0 ]; then
                 errors=1
         fi
@@ -46,14 +51,18 @@ done
 #echo "Errors: $errors"
 #exit 0
 
-zsend=$(zabbix_sender -c ${agentconf} -i ${tempfile})
-if [ $? -ne 0 ]; then
-        echo "ERROR"
+if $debug; then
+	cat ${tempfile}
 else
-	if [[ $errors -gt 0 ]]; then
-		echo "WARN"
+	zsend=$(zabbix_sender -c ${agentconf} -i ${tempfile})
+	if [ $? -ne 0 ]; then
+	        echo "ERROR"
 	else
-		echo "OK"
+		if [[ $errors -gt 0 ]]; then
+			echo "WARN"
+		else
+			echo "OK"
+		fi
 	fi
 fi
 
diff --git a/runtrap.debug b/runtrap.debug
new file mode 120000
index 0000000..4769180
--- /dev/null
+++ b/runtrap.debug
@@ -0,0 +1 @@
+runtrap
\ No newline at end of file