X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b0757ecfa1407796bcd15cf2772e04ec5968350a;hb=refs%2Ftags%2F1.56;hp=0cb0f501ed90b3bf8fbf3fd5ebb8ce180e53c863;hpb=8a75f069df30fae5d585be1d9828e03d1220583e;p=spider.git
diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 0cb0f501..b0757ecf 100644
--- 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
@@ -25,7 +26,7 @@
#
# Copyright (c) 2002 Dirk Koopman G1TLH
#
-# $Id$
+#
#
my ($self, $line) = @_;
@@ -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>) {
@@ -71,10 +72,12 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
my $l = $_;
# dbg($l);
next unless $l =~ m{cluster\.pl$};
+ 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;
@@ -110,7 +113,7 @@ if ($want{totalusers} || $want{all}) {
if ($want{totalspots} || $want{all}) {
$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;
}
@@ -118,14 +121,14 @@ if ($want{totalspots} || $want{all}) {
if ($want{hfvhf} || $want{all}) {
$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ 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;
}
# wwv stuff
if ($want{wwv} || $want{all}) {
$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV SFI and R', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
- $mc->data('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), 'WWV SFI and R') unless $want{cfgonly};
+ $mc->data('wwvsfi', ($Geomag::sfi || $WCY::sfi), ($Geomag::r || $WCY::r), 'WWV SFI and R') unless $want{cfgonly};
$mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV A and K',
'A / K', 'A', 'K') unless $want{dataonly};
$mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};
@@ -138,8 +141,30 @@ 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 C and K 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 A and D 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
#
-my @out = $mc->run unless $want{nomrtg};
+
+my @out;
+{
+local %ENV;
+$ENV{LANG} = 'C';
+@out = $mc->run unless $want{nomrtg};
+}
return (1, @out);