Changeset 46

Show
Ignore:
Timestamp:
01/30/04 15:28:19 (8 years ago)
Author:
jimmyo
Message:

More timeouts in munin-update (Deb#222674).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.19 to 1.20
    r43 r46  
    2929  * Added a new plugin generic/multips to count several procs in one graph. 
    3030    (SF#885579) 
     31  * More timeouts in munin-update (Deb#222674). 
    3132 
    3233munin (1.0.0pre1) 

  • trunk/server/munin-update.in

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r30 r46  
    66# 
    77# $Log$ 
     8# Revision 1.6  2004/01/30 14:28:19  jimmyo 
     9# More timeouts in munin-update (Deb#222674). 
     10# 
    811# Revision 1.5  2004/01/29 18:19:58  jimmyo 
    912# Made Munin compatible with perl 5.005_03 (patch by Lupe Christoph) (SF#884622) 
    …… 
    325328 
    326329                use_old_config ($domain, $name, $oldnode); 
    327                 logger ("Using old configuration for $domain -> $name."); 
     330                logger ("Attempting to use old configuration for $domain -> $name."); 
    328331        } 
    329332} 
    …… 
    430433                  ($node->{port} || $config->{domain}->{$domain}->{port} ||  
    431434                   $config->{port} || "4949"),  
    432                   'Proto'    => "tcp"); 
     435                  'Proto'    => "tcp", "Timeout" => $timeout); 
    433436  my $err = ($socket ? "" : $!); 
    434437 
    …… 
    441444 
    442445      if (!$socket) { 
    443         logger ("Could not connect to $name($node->{address}): $err - Using old configuration"); 
     446        logger ("Could not connect to $name($node->{address}): $err - Attempting to use old configuration"); 
    444447        # If we can't reach the client. Using old Configuration. 
    445448        if (ref $oldnode) { 
    …… 
    487490  { 
    488491      if (!$socket) { 
    489         logger ("Could not connect to $name($node->{address}): $err\nUsing old configuration"); 
     492        logger ("Could not connect to $name($node->{address}): $err\nAttempting to use old configuration"); 
    490493        # If we can't reach the client. Using old Configuration. 
    491494        if (ref $oldnode) { 
    …… 
    579582  if ($@) { 
    580583    die unless ($@ =~ m/Could not run list/); 
    581       logger ("Could not get list from $node->{address}: $!\nUsing old configuration"); 
     584      logger ("Could not get list from $node->{address}: $!\nAttempting to use old configuration"); 
    582585    if (ref $oldnode) { 
    583586      $config->{domain}->{$domain}->{node}->{$name} = $oldnode; 
    …… 
    610613        logger("Client reported timeout in configuration of $servname"); 
    611614        if ($oldnode->{client}->{$servname}) { 
    612           logger("Using old configuration"); 
     615          logger("Attempting to use old configuration"); 
    613616          $config->{domain}->{$domain}->{node}->{$name}->{client}->{$servname} = $oldnode->{client}->{$servname}; 
    614617        } else { 
    …… 
    736739 
    737740    $config->{domain}->{$domain}->{node}->{$name} = $oldnode; 
    738     logger ("Using old configuration for $domain -> $name."); 
     741    logger ("Attempting to use old configuration for $domain -> $name."); 
    739742} 
    740743