remove active debugging from mds

[spider.git] / cmd / mrtg.pl

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 4a872d6172810942393cc967357689a2b90110ad..f60e06655ba950e577fa16e995ece4ba67814ea8 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -28,13 +28,12 @@
 #
 #
 #
-use Time::HiRes qw( clock_gettime CLOCK_PROCESS_CPUTIME_ID );
 
 sub handle
 {
        my ($self, $line) = @_;
 
-       $DB::single = 1;
+#      $DB::single = 1;
        
        # create the arg list
        my %want;
@@ -76,15 +75,14 @@ sub do_it
        }
 
        if (!$main::is_win && ($want{proc} || $want{all})) {
-               $ENV{COLUMNS} = 250;
-               my $secs;
+               my $secs = $main::clssecs + $main::cldsecs;
 
-               $secs = clock_gettime(CLOCK_PROCESS_CPUTIME_ID);
+               dbg "mrtg: proc: cluster=$main::clssecs children=$main::cldsecs clock=$secs" if isdbg('mrtg');
                
-               $mc->cfgprint('proc', [qw(noi unknaszero withzeroes 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};
+               $mc->cfgprint('proc', [qw(unknaszero withzeroes perminute)], 600, 
+                                         "CPU Usage of <font color=#00cc00>node</font> and its <font color=#0000ff>children</font> in seconds",
+                                         'CPU Secs/min', 'Node Secs 10ths', 'Child Secs 10ths', 0.1) unless $want{dataonly};
+               $mc->data('proc', int($main::clssecs*10+0.5), int($main::cldsecs*10+0.5), "Processor Usage") unless $want{cfgonly};
        }
 
        # do the users and nodes