diff options
| author | Niko Tyni <ntyni@iki.fi> | 2006-04-16 08:21:36 +0200 |
|---|---|---|
| committer | Niko Tyni <ntyni@iki.fi> | 2006-04-16 08:21:36 +0200 |
| commit | f15f1a911d68fb398eff6e50f260d17cee2ae956 (patch) | |
| tree | b7f3f3ba332e909c13942dfacc7a97273a30fcc7 | |
| parent | d414b046426118fee953f74bde16a31b83fe9fa9 (diff) | |
| download | smokeping-f15f1a911d68fb398eff6e50f260d17cee2ae956.tar.gz smokeping-f15f1a911d68fb398eff6e50f260d17cee2ae956.tar.xz | |
Bring back 'fping -t'.
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | doc/smokeping_upgrade.pod | 9 | ||||
| -rw-r--r-- | lib/Smokeping/probes/FPing.pm | 11 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,6 @@ +* brought back the FPing.pm 'timeout' parameter, since it does something + after all. - niko, requested by Peter Klausner <peter.klausner *gmail.com> + 2006/4/16 -- released version 20060416_trunk 2006/4/15 -- released version 20060415_trunk diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod index 3b73861..75bdef1 100644 --- a/doc/smokeping_upgrade.pod +++ b/doc/smokeping_upgrade.pod @@ -23,6 +23,15 @@ An official list of changes with each release can be found in the CHANGES file in the Smokeping distribution. This document tries to complement that with upgrading instructions etc. +=head1 2.0.8 to 2.0.9 + +=head2 L<FPing|Smokeping::probes::FPing> + +The 'timeout' variable removed in 2.0.5 has been brought back. +It is used to give the C<fping> command the C<-t> parameter, +which apparently affects the timeout of the last ping in the +counting (C<-C>) mode used by Smokeping. + =head1 2.0.4 to 2.0.5 =head2 L<FPing|Smokeping::probes::FPing> diff --git a/lib/Smokeping/probes/FPing.pm b/lib/Smokeping/probes/FPing.pm index 9391849..7223d44 100644 --- a/lib/Smokeping/probes/FPing.pm +++ b/lib/Smokeping/probes/FPing.pm @@ -104,6 +104,7 @@ sub ping ($){ return unless @{$self->addresses}; my @params = () ; push @params , "-b$self->{properties}{packetsize}" if $self->{properties}{packetsize}; + push @params, "-t" . int(1000 * $self->{properties}{timeout}) if $self->{properties}{timeout}; push @params, "-i" . int(1000 * $self->{properties}{mininterval}); push @params, "-p" . int(1000 * $self->{properties}{hostinterval}) if $self->{properties}{hostinterval}; my @cmd = ( @@ -157,6 +158,16 @@ sub probevars { _doc => "The ping packet size (in the range of 12-64000 bytes).", }, + timeout => { + _re => '(\d*\.)?\d+', + _example => 1.5, + _doc => <<DOC, +The fping "-t" parameter, but in (possibly fractional) seconds rather than +milliseconds, for consistency with other Smokeping probes. Note that as +Smokeping uses the fping 'counting' mode (-C), this apparently only affects +the last ping. +DOC + }, hostinterval => { _re => '(\d*\.)?\d+', _example => 1.5, |