Changeset 3844

Show
Ignore:
Timestamp:
07/28/10 18:59:53 (2 years ago)
Author:
ligne
Message:

do the same for the intervals.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/node/lib/Munin/Node/ProxySpooler.pm

    r3843 r3844  
    6464 
    6565    # ready to actually do stuff! 
    66     my $intervals = $self->_get_intervals(); 
    67     $self->_launch_pollers($intervals); 
     66    $self->_get_intervals(); 
     67    $self->_launch_pollers(); 
    6868 
    6969    # Indiscriminately kill every process in the group with SIGTERM when asked 
    …… 
    109109        # Respawn the poller 
    110110        logger("Respawning poller for '$service'"); 
    111         my $new_pid = $self->_launch_single_poller($service, $intervals->{$service}); 
     111        my $new_pid = $self->_launch_single_poller($service, $self->{intervals}->{$service}); 
    112112        $self->{pollers}{$new_pid} = $service; 
    113113        $poller_restarted{$service} = time; 
    …… 
    153153    $self->_close_node_connection; 
    154154 
    155     return \%intervals; 
     155    $self->{intervals} = \%intervals; 
     156 
     157    return; 
    156158} 
    157159 
    …… 
    193195sub _launch_pollers 
    194196{ 
    195     my ($self, $intervals) = @_; 
     197    my ($self) = @_; 
    196198 
    197199    my %pollers; 
    198200 
    199     while (my ($service, $interval) = each %$intervals) { 
     201    while (my ($service, $interval) = each %{$self->{intervals}}) { 
    200202        my $poller_pid = $self->_launch_single_poller($service, $interval); 
    201203        $pollers{$poller_pid} = $service;