longer timeout for slaves and separate cache files per slave for improved scaling -- Phillip Moore

1 files changed, 4 insertions, 11 deletions

diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index c7726ca..b3e37b9 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1849,22 +1849,15 @@ sub update_rrds($$$$$$) {
         my $probeobj = $probes->{$probe};
         my $pings = $probeobj->_pings($tree);
         if ($prop eq 'host' and check_filter($cfg,$name) and $tree->{$prop} !~ m|^/|) { # skip multihost
-            my %slave_test;
-            my $slaveupdates;
             my @updates;
             if (not $tree->{nomasterpoll} or $tree->{nomasterpoll} eq 'no'){
                 @updates = ([ "", time, $probeobj->rrdupdate_string($tree) ]);
             }
             if ($tree->{slaves}){
-                %slave_test = ( map { $_,1 } split(/\s+/, $tree->{slaves}));
-                $slaveupdates = Smokeping::Master::get_slaveupdates($name);     
-                for my $slave (@{$slaveupdates}){
-                    if (not $slave_test{$slave->[0]}){
-                        warn "WARNING: skipping update for $slave->[0] since it is not configured for $name\n";
-                        next;
-                    }
-                    push @updates, $slave;
-                }
+                my @slaves = split(/\s+/, $tree->{slaves});
+                foreach my $slave (@slaves) {
+                    push @updates, Smokeping::Master::get_slaveupdates($name, $slave);
+                } #foreach my $checkslave
             }
             for my $update (sort {$a->[1] <=> $b->[1]}  @updates){ # make sure we put the updates in chronological order in
                 my $s = $update->[0] ? "~".$update->[0] : "";