add CTY-3304

[spider.git] / cmd / mrtg.pl

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 0d027b9a39f7f66b97b9bbe796a3abd5cf1cbf2e..b0757ecfa1407796bcd15cf2772e04ec5968350a 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -13,6 +13,7 @@
 #    hfvhf            - all spots split into HF and VHF
 #    wwv              - two graphs of WWV, one SFI and R other A and K
 #    wcy              - WCY A and K 
+#    pc92             - PC92 C and K, PC92 A and D
 #    all              - all of the above 
 #    
 # b) actions          
@@ -63,7 +64,7 @@ if ($want{agw}) {
 if (!$main::is_win && ($want{proc} || $want{all})) {
        $ENV{COLUMNS} = 250;
        my $secs;
-       my $f = new IO::File "ps aux |";
+       my $f = new IO::File "ps ax -ocputime,args |";
 #      dbg("$f");
        if ($f) {
                while (<$f>) {
@@ -74,8 +75,9 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
                        next if $l =~ m{bash\s+\-c};
                        my @f = split /\s+/, $l;
 #                      dbg("$f[9]");
-                       my ($m, $s) = split /:/, $f[9];
-                       $secs = ($m * 60) + $s;
+                       my ($d, $h, $m, $s) = $f[0] =~ /(?:(\d+)-)?(\d+):(\d\d):(\d\d)$/;
+                       $d ||= 0;
+                       $secs = ($d * 86400) + ($h * 3600) + ($m * 60) + $s;
                        last;
                }
                $f->close;
@@ -109,17 +111,17 @@ if ($want{totalusers} || $want{all}) {
 
 # do the total spots
 if ($want{totalspots} || $want{all}) {
-       $mc->cfgprint('totalspots',  [qw(unknaszero absolute noi)], 1000, 'Total Spots',
+       $mc->cfgprint('totalspots',  [qw(unknaszero gauge noi)], 1000, 'Total Spots',
                         'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
-       $mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
+       $mc->data('totalspots', int ($Spot::totalspots/5+0.5), int($Spot::totalspots/5+0.5), 'Total Spots') unless $want{cfgonly};
        $Spot::totalspots = 0;
 }
 
 # do the HF and VHF spots
 if ($want{hfvhf} || $want{all}) {
-       $mc->cfgprint('hfspots', [qw(unknaszero absolute)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
+       $mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
                         'Spots / min', 'HF', 'VHF') unless $want{dataonly};
-       $mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
+       $mc->data('hfspots', int($Spot::hfspots/5+0.5), int($Spot::vhfspots/5+0.5), 'HF and VHF+ Spots') unless $want{cfgonly};
        $Spot::hfspots = $Spot::vhfspots = 0;
 }
 
@@ -139,6 +141,22 @@ if ($want{wcy} || $want{all}) {
        $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
 }
 
+if ($want{pc92} || $want{all}) {
+
+       $mc->cfgprint('pc92ck', [], 1024000,
+                                 "PC92 <font color=#00cc00>C</font> and <font color=#0000ff>K</font> records into $main::mycall",
+                                 'Bytes / Sec', 'C', 'K') unless $want{dataonly};
+       $mc->data('pc92ck', $DXProt::pc92Cin, $DXProt::pc92Kin, "PC92 C and K into $main::mycall") unless $want{cfgonly};
+#      $DXProt::pc92Cin = $DXProt::pc92Kin = 0;
+
+       $mc->cfgprint('pc92ad', [], 1024000,
+                                 "PC92 <font color=#00cc00>A</font> and <font color=#0000ff>D</font> records into $main::mycall",
+                                 'Bytes / Sec', 'A', 'D') unless $want{dataonly};
+       $mc->data('pc92ad', $DXProt::pc92Ain, $DXProt::pc92Din, "PC92 A and D into $main::mycall") unless $want{cfgonly};
+#      $DXProt::pc92Ain = $DXProt::pc92Din = 0;
+
+}
+
 # 
 # do the mrtg thing
 #