Changeset 665

Show
Ignore:
Timestamp:
25/01/05 21:06:55 (7 years ago)
Author:
jimmyo
Message:

Make munin-limits work properly with perl 5.6 (SF#1109039).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.272 to 1.273
    r663 r665  
    22 
    33  * Main: Fix bug with calculation of "Avg:" field when using graph_sums. 
     4  * Main: Make munin-limits work properly with perl 5.6 (SF#1109039). 
    45  * Main/Node: Added support for TLS. 
    5   * Installation: Make the single python plugin use @@PYTHON@@ again. 
    66  * Plugin: linux/users now has proper hashbang. 
    77  * Plugin: Bugfix in generic/sendmail_mail* autoconf. 
    …… 
    1717  * Plugins: Plugin generic/squid_cache now handles multiple caches 
    1818    (Deb#288579). 
     19  * Installation: Make the single python plugin use @@PYTHON@@ again. 
    1920  * Docs: Documented minimum requirements for use of graph_sums (SF#1109040). 
    2021 

  • trunk/server/munin-limits.in

    • Property cvs2svn:cvs-rev changed from 1.24 to 1.25
    r605 r665  
    1919# 
    2020# $Log$ 
     21# Revision 1.25  2005/01/25 20:06:55  jimmyo 
     22# Make munin-limits work properly with perl 5.6 (SF#1109039). 
     23# 
    2124# Revision 1.24  2005/01/05 15:40:35  jimmyo 
    2225# Main: "contacts" can now be set to "none". 
    …… 
    453456                } 
    454457                logger ("Debug: opening for writing: \"" . join('" "',@cmd) . "\".") if $DEBUG; 
    455                 open ($pipe, $cmd[0], @cmd[1 .. $#cmd]) or logger ("Warning: Could not run command \"" . join(' ',@cmd) . "\": $!"); 
     458                if ($cmd[0] == ">") 
     459                { 
     460                    if (! open ($pipe, $cmd[0], join (' ', @cmd[1 .. $#cmd]))) 
     461                    { 
     462                        logger ("Fatal: Could not open " . join (' ', @cmd[1 .. $#cmd]) . " for writing: $!"); 
     463                        exit 3; 
     464                    } 
     465                } 
     466                else 
     467                { 
     468                    my $pid = open ($pipe, "|-"); 
     469                    if (!defined $pid) 
     470                    { 
     471                        logger ("Fatal: Unable to  fork: $!"); 
     472                        exit 3; 
     473                    } 
     474                    if (!$pid) # Child 
     475                    { 
     476                        exec (@cmd[1 .. $#cmd]) or logger ("Warning: Could not run command \"" . join(' ',@cmd[1 .. $#cmd]) . "\": $!"); 
     477                        exit 5; 
     478                        # NOTREACHED 
     479                    } 
     480                } 
    456481                $config->{'contact'}->{$c}->{'pipe_command'} = $cmd; 
    457482                $config->{'contact'}->{$c}->{'pipe'} = $pipe;