Ver.1.4.30: Fix error in tools/mrtg.

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index 89297b0..886e7b6 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -628,6 +628,11 @@ Ver.1.4.29 at 2008.3.17</DT>
 <DD>\r
 Add code into perl script to prevent multiple login.\r
 </DD>\r
+<DT>\r
+Ver.1.4.30 at 2008.3.18</DT>\r
+<DD>\r
+Fix error in tools/mrtg.\r
+</DD>\r
 \r
 </DL>\r
 <b>Please see CVS in SourceForge.net to check the file difference between versions.</b>\r

diff --git a/opengate/tools/mrtg/output.sh b/opengate/tools/mrtg/output.sh
index e8cbf28..a64a88b 100644 (file)
--- a/opengate/tools/mrtg/output.sh
+++ b/opengate/tools/mrtg/output.sh
@@ -2,7 +2,7 @@
 
 #######################################
 ##
-## shwo opengate status for MRTG
+## show opengate status for MRTG
 ##
 ##   1 line : IPv6 Users
 ##   2 line : Total Users
@@ -26,7 +26,7 @@ tmp_6="/tmp/og_count_6.tmp"
 
 ######################################################
 
-ps ax | grep $process > $tmp_all
+ps ax | grep $process | grep -v grep > $tmp_all
 
 COUNT=`wc -l $tmp_all | awk '{print $1}'`
 

diff --git a/opengate/tools/mrtg/output2syslog.sh b/opengate/tools/mrtg/output2syslog.sh
index 2349094..d6d5db6 100644 (file)
--- a/opengate/tools/mrtg/output2syslog.sh
+++ b/opengate/tools/mrtg/output2syslog.sh
@@ -1,34 +1,34 @@
-#!/bin/sh\r
-\r
-#######################################\r
-##\r
-## shwo opengate status for syslog\r
-##\r
-#######################################\r
-\r
-LANG=C\r
-COLUMNS=256\r
-\r
-export LANG\r
-export COLUMNS\r
-\r
-process="opengatesrv.cgi"\r
-facility="local3.info"\r
-\r
-tmp_all="/tmp/og_count_all.tmp"\r
-tmp_6="/tmp/og_count_6.tmp"\r
-\r
-######################################################\r
-\r
-ps ax | grep $prosess > $tmp_all\r
-\r
-COUNT=`wc -l $tmp_all | awk '{print $1}'`\r
-\r
-grep "(useIPv6)" $tmp_all > $tmp_6\r
-\r
-COUNT6=`wc -l $tmp_6 | awk '{print $1}'`\r
-\r
-rm $tmp_all\r
-rm $tmp_6\r
-\r
-echo "$COUNT $COUNT6" | /usr/bin/logger -p $facility\r
+#!/bin/sh
+
+#######################################
+##
+## show opengate status for syslog
+##
+#######################################
+
+LANG=C
+COLUMNS=256
+
+export LANG
+export COLUMNS
+
+process="opengatesrv.cgi"
+facility="local3.info"
+
+tmp_all="/tmp/og_count_all.tmp"
+tmp_6="/tmp/og_count_6.tmp"
+
+######################################################
+
+ps ax | grep $process |grep -v grep > $tmp_all
+
+COUNT=`wc -l $tmp_all | awk '{print $1}'`
+
+grep "(useIPv6)" $tmp_all > $tmp_6
+
+COUNT6=`wc -l $tmp_6 | awk '{print $1}'`
+
+rm $tmp_all
+rm $tmp_6
+
+echo "$COUNT $COUNT6" | /usr/bin/logger -p $facility

diff --git a/opengate/tools/mrtg/output2web.sh b/opengate/tools/mrtg/output2web.sh
index c25d2cf..3a530bd 100644 (file)
--- a/opengate/tools/mrtg/output2web.sh
+++ b/opengate/tools/mrtg/output2web.sh
@@ -2,7 +2,7 @@
 
 #######################################
 ##
-## shwo opengate status for MRTG
+## show opengate status for MRTG
 ##
 ##   1 line : IPv6 Users
 ##   2 line : Total Users
@@ -25,9 +25,9 @@ tmp_6="/tmp/og_count_6.tmp"
 process="opengatesrv.cgi"
 
 
-######################################################3
+######################################################
 
-ps ax | grep $process > $tmp_all
+ps ax | grep $process | grep -v grep > $tmp_all
 
 COUNT=`wc -l $tmp_all | awk '{print $1}'`