Changeset 3352

Show
Ignore:
Timestamp:
13/02/10 16:22:18 (2 years ago)
Author:
steve.schnepp
Message:

r37@sandra (orig r3344): feiner.tom | 2010-02-08 22:25:49 +0100
Corrected incorrect use of $MUNIN_PLUGSTATE in mailman plugin, pointed out in debian bug http://bugs.debian.org/568793
r38@sandra (orig r3345): janl | 2010-02-09 13:45:00 +0100

  • munin-update: Fix config line continuation hadling

    r41@sandra (orig r3348): feiner.tom | 2010-02-09 21:34:52 +0100
    Fix ticket #857 - mysql_ plugin suggests wrong values
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/snide/pre_1.5/master/lib/Munin/Master/Config.pm

    r3341 r3352  
    484484        $self->_trim($line); 
    485485 
    486         if ( !length($line) ) { 
    487             next; 
    488         } 
    489  
    490486        # Handle continuation lines (ending in \) 
    491487        if ($line =~ s|\\$||) { 
    …… 
    493489            next; 
    494490        } elsif ($continuation) { 
    495             # We still have to add the last line 
    496             $line = $continuation . $line;  
     491            $line = $continuation . $line; 
    497492            $continuation = ''; 
    498493        } 
    499          
     494 
     495        # This must be handled after continuation hadling otherwise 
     496        # empty lines will be ignored in continuation context. 
     497        next if !length($line); 
     498 
    500499        # Group/host/service configuration is saved for later persual. 
    501500        # Everything else is saved at once.  Note that _trim removes 

  • people/snide/pre_1.5/plugins/node.d/mailman.in

    r3250 r3352  
    2525=cut 
    2626 
    27 $statefile = "$MUNIN_PLUGSTATE/munin-mailman-log.state"; 
     27use Munin::Common::Defaults; 
     28 
     29$statefile = "$Munin::Common::Defaults::MUNIN_PLUGSTATE/munin-mailman-log.state"; 
    2830$pos = undef; 
    2931$posts = 0; 

  • people/snide/pre_1.5/plugins/node.d/mysql_.in

    r3315 r3352  
    757757    #   SHOW SLAVE STATUS 
    758758 
    759     local $_; 
    760     print "mysql_$_\n" for (sort keys(%graphs)); 
     759    foreach my $graph (sort keys(%graphs)) { 
     760        print "$graph\n"; 
     761    } 
    761762 
    762763    return 0;