put back msg totals for mrtg and background mrtg

diff --git a/Changes b/Changes
index d26bd916d1dc742aeb157768a033b0ee74f46c50..658bc05e7ac603b1fcd37f2e1fd264351e5d8ead 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 18Aug16=======================================================================
 1. Add CTY-2610
+2. put back msg total in & total out for mrtg and background mrtg
 16Aug16=======================================================================
 1. Mega change to push all local data in $root/local_data and where there
    is duplication with system data (still in $root/data) then use whichever

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index b0757ecfa1407796bcd15cf2772e04ec5968350a..db2d2e1109bb52b641093ea19cff382a52719ca7 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -29,142 +29,157 @@
 #
 #
 
-my ($self, $line) = @_;
-
-# create the arg list
-my %want;
-for (split /\s+/, $line) { $want{lc $_} = 1};
-$want{nomrtg} = 1 if $want{cfgonly} || $want{test};
-                        
-return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
-
-my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
-
-# do Data in / out totals
-my $din = $Msg::total_in;
-my $dout = $Msg::total_out;
-unless ($want{agw}) {
-       $din += $AGWMsg::total_in;
-       $dout += $AGWMsg::total_out;
+sub handle
+{
+       my ($self, $line) = @_;
+       
+       # create the arg list
+       my %want;
+       for (split /\s+/, $line) { $want{lc $_} = 1};
+       $want{nomrtg} = 1 if $want{cfgonly} || $want{test};
+       
+       return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
+
+       my @out = $self->spawn_cmd("mrtg $line", \&do_it, args=>[%want]);
+       
+       return (1, @out);
 }
 
-$mc->cfgprint('msg', [], 64000, 
-                "Cluster Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
-                'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
-$mc->data('msg', $din, $dout, "Data in and out of $main::mycall") unless $want{cfgonly};
 
-# do AGW stats if they apply
-if ($want{agw}) {
-       $mc->cfgprint('agw', [], 64000, 
-                                 "AGW Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
+sub do_it
+{
+       my %want = @_;
+       
+       my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
+
+       # do Data in / out totals
+       my $din = $Msg::total_in;
+       my $dout = $Msg::total_out;
+       unless ($want{agw}) {
+               $din += $AGWMsg::total_in;
+               $dout += $AGWMsg::total_out;
+       }
+
+       $mc->cfgprint('msg', [], 64000, 
+                                 "Cluster Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
                                  'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
-       $mc->data('agw', $AGWMsg::total_in, $AGWMsg::total_out, "AGW 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}) {
+               $mc->cfgprint('agw', [], 64000, 
+                                         "AGW Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
+                                         'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
+               $mc->data('agw', $AGWMsg::total_in, $AGWMsg::total_out, "AGW Data in and out of $main::mycall") unless $want{cfgonly};
+       }
 
-if (!$main::is_win && ($want{proc} || $want{all})) {
-       $ENV{COLUMNS} = 250;
-       my $secs;
-       my $f = new IO::File "ps ax -ocputime,args |";
-#      dbg("$f");
-       if ($f) {
-               while (<$f>) {
-                       chomp;
-                       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 ($d, $h, $m, $s) = $f[0] =~ /(?:(\d+)-)?(\d+):(\d\d):(\d\d)$/;
-                       $d ||= 0;
-                       $secs = ($d * 86400) + ($h * 3600) + ($m * 60) + $s;
-                       last;
+       if (!$main::is_win && ($want{proc} || $want{all})) {
+               $ENV{COLUMNS} = 250;
+               my $secs;
+               my $f = new IO::File "ps ax -ocputime,args |";
+               #       dbg("$f");
+               if ($f) {
+                       while (<$f>) {
+                               chomp;
+                               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 ($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;
+               }
+               if ($secs) {
+                       $mc->cfgprint('proc', [qw(noo perminute)], 5*60, 
+                                                 "Processor Usage",
+                                                 'Proc Secs / min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
+                       $mc->data('proc', $secs, $secs, "Processor Usage") unless $want{cfgonly};
                }
-               $f->close;
        }
-       if ($secs) {
-               $mc->cfgprint('proc', [qw(noo perminute)], 5*60, 
-                                         "Processor Usage",
-                                         'Proc Secs / min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
-               $mc->data('proc', $secs, $secs, "Processor Usage") unless $want{cfgonly};
+
+       # do the users and nodes
+       my $users = DXChannel::get_all_users();
+       my $nodes = DXChannel::get_all_nodes();
+
+       $mc->cfgprint('users', [qw(unknaszero gauge)], 500, 
+                                 "<font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> on $main::mycall",
+                                 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
+       $mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
+
+       # do the  total users and nodes
+       if ($want{totalusers} || $want{all}) {
+               $nodes = Route::Node::count();
+               $users = Route::User::count();
+               $mc->cfgprint('totalusers', [qw(unknaszero gauge)], 10000, 
+                                         'Total <font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> in the Visible Cluster Network',
+                                         'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
+               $mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly};
        }
-}
 
-# do the users and nodes
-my $users = DXChannel::get_all_users();
-my $nodes = DXChannel::get_all_nodes();
-
-$mc->cfgprint('users', [qw(unknaszero gauge)], 500, 
-                "<font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> on $main::mycall",
-                'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
-$mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
-
-# do the  total users and nodes
-if ($want{totalusers} || $want{all}) {
-       $nodes = Route::Node::count();
-       $users = Route::User::count();
-       $mc->cfgprint('totalusers', [qw(unknaszero gauge)], 10000, 
-                       'Total <font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> in the Visible Cluster Network',
-                        'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
-       $mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly};
-}
+       # do the total spots
+       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', int ($Spot::totalspots/5+0.5), int($Spot::totalspots/5+0.5), 'Total Spots') unless $want{cfgonly};
+               $Spot::totalspots = 0;
+       }
 
-# do the total spots
-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', 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 gauge)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
+                                         'Spots / min', 'HF', 'VHF') unless $want{dataonly};
+               $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;
+       }
 
-# do the HF and VHF spots
-if ($want{hfvhf} || $want{all}) {
-       $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', 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 <font color=#00cc00>SFI</font> and <font color=#0000ff>R</font>', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
+               $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 <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
+                                         'A / K', 'A', 'K') unless $want{dataonly};
+               $mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};
+       }
 
-# wwv stuff
-if ($want{wwv} || $want{all}) {
-       $mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV <font color=#00cc00>SFI</font> and <font color=#0000ff>R</font>', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
-       $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 <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
-                        'A / K', 'A', 'K') unless $want{dataonly};
-       $mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};
-}
+       # WCY stuff
+       if ($want{wcy} || $want{all}) {
+               $mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
+                                         'A / K', 'A', 'K') unless $want{dataonly};
+               $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
+       }
 
-# WCY stuff
-if ($want{wcy} || $want{all}) {
-       $mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
-                        'A / K', 'A', 'K') unless $want{dataonly};
-       $mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
-}
+       if ($want{pc92} || $want{all}) {
 
-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('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;
 
-       $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
+       #
 
-# 
-# do the mrtg thing
-#
+       my @out;
+       {
+               local %ENV;
+               $ENV{LANG} = 'C';
+               @out = $mc->run unless $want{nomrtg};
+       }
 
-my @out;
-{
-local %ENV;
-$ENV{LANG} = 'C';
-@out = $mc->run unless $want{nomrtg};
+       return @out;
 }
-return (1, @out);
+

diff --git a/mrtg/.cvsignore b/mrtg/.cvsignore
deleted file mode 100644 (file)
index 72e8ffc..0000000
--- a/mrtg/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*

diff --git a/perl/Msg.pm b/perl/Msg.pm
index b64318ff19c01d68f6d5312403493d056a81c1bf..ba0e6b8eadf520d92f78ecde2219ae49bc903a1d 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -289,7 +289,7 @@ sub _send_stuff
                }
                if (defined $sock) {
                        $sock->write($data);
-                       $total_out = $lth;
+                       $total_out += $lth;
                } else {
                        dbg("_send_stuff $call ending data ignored: $data");
                }
@@ -378,6 +378,8 @@ sub _rcv {                     # Complement to _send
     my $sock = $conn->{sock};
     return unless defined($sock);
 
+       $total_in += length $msg;
+
        my @lines;
        if (isdbg('raw')) {
                my $call = $conn->{call} || 'none';