diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2006-09-08 15:01:16 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2006-09-08 15:01:16 +0200 |
| commit | d9d02e26fe34b577f5b2dab1d654a3da49190449 (patch) | |
| tree | 765ff84576dcc4d2b7edf3ba63f9ef561db15a60 /lib | |
| parent | 1947fa82b24b9f5d526f5909454c8c7168ce3bd4 (diff) | |
| download | smokeping-d9d02e26fe34b577f5b2dab1d654a3da49190449.tar.gz smokeping-d9d02e26fe34b577f5b2dab1d654a3da49190449.tar.xz | |
updated version strings
intergrated fixes for alert priority settings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Smokeping.pm | 4 | ||||
| -rw-r--r-- | lib/Smokeping/probes/FPing.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 10ef63e..5535df1 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -1161,8 +1161,8 @@ sub update_rrds($$$$$) { shift @{$x->{loss}}; shift @{$x->{rtt}}; } - for (sort { $cfg->{Alerts}{$a}{priority}||0 - <=> $cfg->{Alerts}{$b}{priority}||0} @{$tree->{alerts}}) { + for (sort { ($cfg->{Alerts}{$a}{priority}||0) + <=> ($cfg->{Alerts}{$b}{priority}||0)} @{$tree->{alerts}}) { my $alert = $cfg->{Alerts}{$_}; if ( not $alert ) { do_log "WARNING: Empty alert in ".(join ",", @{$tree->{alerts}})." ($name)\n"; diff --git a/lib/Smokeping/probes/FPing.pm b/lib/Smokeping/probes/FPing.pm index 7223d44..553aaae 100644 --- a/lib/Smokeping/probes/FPing.pm +++ b/lib/Smokeping/probes/FPing.pm @@ -65,7 +65,7 @@ sub new($$$) if $return =~ m/only.+root/; if ($return =~ m/bytes, ([0-9.]+)\sms\s+.*\n.*\n.*:\s+([0-9.]+)/ and $1 > 0){ - $self->{pingfactor} = 1000 * $2/$1; + $self->{pingfactor} = 1000 * $1/$2; print "### fping seems to report in ", $1/$2, " milliseconds\n"; } else { $self->{pingfactor} = 1000; # Gives us a good-guess default |