Changeset 3845

Show
Ignore:
Timestamp:
28/07/10 19:04:11 (2 years ago)
Author:
ligne
Message:

get the intervals in _launch_pollers(), and the node list in _get_service_list().

return a reference to the intervals for convenience.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3844 r3845  
    6464 
    6565    # ready to actually do stuff! 
    66     $self->_get_intervals(); 
     66 
    6767    $self->_launch_pollers(); 
    6868 
    …… 
    131131    $self->_open_node_connection; 
    132132 
    133     my @nodes    = $self->_get_node_list            or die "No nodes\n"; 
    134     my @services = $self->_get_service_list(@nodes) or die "No services\n"; 
     133    my @services = $self->_get_service_list() or die "No services\n"; 
    135134 
    136135    foreach my $service (@services) { 
    …… 
    155154    $self->{intervals} = \%intervals; 
    156155 
    157     return; 
     156    return \%intervals; 
    158157} 
    159158 
    …… 
    166165sub _get_service_list 
    167166{ 
    168     my ($self, @nodes) = @_; 
     167    my ($self) = @_; 
    169168    my @services; 
     169 
     170    my @nodes = $self->_get_node_list() or die "No nodes\n"; 
    170171 
    171172    foreach my $node (@nodes) { 
    …… 
    199200    my %pollers; 
    200201 
    201     while (my ($service, $interval) = each %{$self->{intervals}}) { 
     202    my $intervals = $self->_get_intervals(); 
     203 
     204    while (my ($service, $interval) = each %$intervals) { 
    202205        my $poller_pid = $self->_launch_single_poller($service, $interval); 
    203206        $pollers{$poller_pid} = $service;