separate out AGWstats

diff --git a/Changes b/Changes
index e9dd7d2fc337e4c56321aaaca1341c2e75715b34..1327a8d3c462197f016464d95dd3f6bc6b180cb5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@
 is the minimum granularity available.
 3. add some separation between cfg file making, data generation and mrtg 
 running. See /spider/cmd/mrtg.pl for some instructions...
+4. Added data in and out to the MRTG stats, you need to do an indexmaker
+to get them onto the index page
 28Sep02=======================================================================
 1. Put some transparent caching into Prefix.pm to see if this has a 
 performance impact.

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index dfc0fcb5050661f81e0827cec76066ed19231220..7c6b8573d589980c3202fa3e9ce20841767a8f24 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -7,6 +7,7 @@
 # The arguments (keywords) to the mrtg command are these
 #
 # a) content          (you always get the node users and nodes)
+#    agw              - include the AGW stats separately 
 #    totalspots       - all spots
 #    hfvhf            - all spots split into HF and VHF
 #    wwv              - two graphs of WWV, one SFI and R other A and K
@@ -37,11 +38,18 @@ return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -
 
 my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
 
-# do Msg totals
+# do Data in / out totals
+my $din = $Msg::total_in;
+my $dout = $Msg::total_in;
+unless ($want{agw}) {
+       $din += $AGWMsg::total_in;
+       $dout += $AGWMsg::total_out;
+}
+
 $mc->cfgprint('msg', [], 64000, 
                 "Data in and out of $main::mycall",
                 'Bits / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
-$mc->data('msg', $Msg::total_in, $Msg::total_out, "Data in and out of $main::mycall") unless $want{cfgonly};
+$mc->data('msg', $din, $dout, "Data in and out of $main::mycall") unless $want{cfgonly};
 
 # do AGW stats if they apply
 if ($want{agw}) {