From 011dc2e21b2d0cef39c107c6e38356151d0c1d36 Mon Sep 17 00:00:00 2001
From: Dju <julstunt@gmail.com>
Date: Tue, 7 Sep 2010 02:52:09 +0200
Subject: [PATCH] fixed other bug

---
 plugins/other/pure-ftpd-bw | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/other/pure-ftpd-bw b/plugins/other/pure-ftpd-bw
index 2d717200..57ecf57b 100755
--- a/plugins/other/pure-ftpd-bw
+++ b/plugins/other/pure-ftpd-bw
@@ -1,11 +1,12 @@
 #!/bin/bash
 #
 #
-# pure-ftpd plugin
+# pure-ftpd-bw plugin
+# show the bandwidth used by pure-ftpd, counts the bytes sent and received
 # made by Dju
-# v1.1
+# v1.2
 #
-# commands needed: logtail - grep - awk
+# commands needed: logtail - grep
 #
 #
 # Parameters
@@ -25,12 +26,9 @@ LOGTAIL=$(which logtail)
 OFFSET_FILE=/var/lib/munin/plugin-state/pure-ftpd-bw.offset
 
 
-[ ! -z "$LOGTAIL" -a -f $LOGTAIL -a -x $LOGTAIL ] && LT_OK=1 || LT_OK=0
-
-
 if [ "$1" = "autoconf" ]; then
 	if [ -f $LOGFILE ]; then
-		if [ $LT_OK -eq 1 ]; then
+		if [ ! -z "$LOGTAIL" -a -f $LOGTAIL -a -x $LOGTAIL ]; then
 	        	echo yes
         		exit 0
 		else
@@ -43,27 +41,29 @@ if [ "$1" = "autoconf" ]; then
 	fi
 fi
 
-
 if [ "$1" = "config" ]; then
 	echo 'graph_title Pure Ftpd Bandwidth'
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel Datas sent / received'
-	echo 'graph_category pure-ftp'
+	echo 'graph_category pure-ftpd'
 	echo 'dl.label Bytes downloaded'
 	echo 'ul.label Bytes uploaded'
 	exit 0
 fi
 
-
 TMP1=`mktemp`
 if [ -f $TMP1 ]; then
 	$LOGTAIL -o $OFFSET_FILE $LOGFILE | grep 'GET \|PUT ' > $TMP1
-	echo -n "dl.value "
-	awk '/GET / {DL = DL + $NF} END {print DL}' $TMP1
-	echo -n "ul.value "
-	awk '/PUT / {UL = UDL + $NF} END {print UL}' $TMP1
+	dls=$(awk '/GET / {print $9}' $TMP1)
+	dl=0
+	for d in $dls; do dl=$(expr $dl + $d); done
+	echo "dl.value ${dl}"
+	uls=$(awk '/PUT / {print $9}' $TMP1)
+	ul=0
+	for u in $uls; do ul=$(expr $ul + $u); done
+	echo "ul.value ${ul}"
 	rm $TMP1
 else
-	echo "cant create temp file"
+	echo "cant write temp file"
 	exit 1
-fi
+fi
\ No newline at end of file