diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | bin/smokeping.dist | 2 | ||||
| -rwxr-xr-x | htdocs/smokeping.cgi.dist | 2 | ||||
| -rw-r--r-- | lib/Smokeping.pm | 8 |
4 files changed, 9 insertions, 7 deletions
@@ -1,6 +1,6 @@ SHELL = /bin/sh -VERSION = 2.0BRANCHE -NUMVERSION = 1.99003 +VERSION = 2.0rc3 +NUMVERSION = 1.99004 IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|.svn GROFF = groff .PHONY: man html txt ref examples check-examples patch killdoc doc tar rename-man symlinks remove-symlinks diff --git a/bin/smokeping.dist b/bin/smokeping.dist index 02deda1..a9d4504 100755 --- a/bin/smokeping.dist +++ b/bin/smokeping.dist @@ -4,7 +4,7 @@ use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl); use lib qw(lib); -use Smokeping 1.99001; +use Smokeping 1.99004; Smokeping::main("etc/config.dist"); diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist index f26ad5b..4a1c34c 100755 --- a/htdocs/smokeping.cgi.dist +++ b/htdocs/smokeping.cgi.dist @@ -5,7 +5,7 @@ use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); use CGI::Carp qw(fatalsToBrowser); -use Smokeping 1.38; +use Smokeping 1.99004; Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 6718f36..048f795 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -20,7 +20,7 @@ use Smokeping::RRDtools; # globale persistent variables for speedy use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode); -$VERSION="1.99001"; +$VERSION="1.99004"; # we want opts everywhere my %opt; @@ -918,13 +918,15 @@ sub update_rrds($$$$$) { my $justthisprobe = shift; # if defined, update only the targets probed by this probe my $probe = $tree->{probe}; - my $probeobj = $probes->{$probe}; foreach my $prop (keys %{$tree}) { if (ref $tree->{$prop} eq 'HASH'){ update_rrds $cfg, $probes, $tree->{$prop}, $name."/$prop", $justthisprobe; } - next if defined $justthisprobe and $probe ne $justthisprobe; + # if we are looking down a branche where no probe propperty is set there is not sense + # in further exploring it + next unless defined $probe and defined $justthisprobe and $probe ne $justthisprobe; + my $probeobj = $probes->{$probe}; if ($prop eq 'host' and check_filter($cfg,$name)) { #print "update $name\n"; my $updatestring = $probeobj->rrdupdate_string($tree); |