From bf2a5c2c1de2a1b20348bfb6c1f49b850f0db4f6 Mon Sep 17 00:00:00 2001 From: Tobi Oetiker Date: Wed, 10 Mar 2010 05:53:36 +0000 Subject: port the timeout fix from CiscoRTTMon ICMPPing to DNS and TcpConnect versions --- lib/Smokeping/probes/CiscoRTTMonDNS.pm | 10 ++++++++-- lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'lib/Smokeping/probes') diff --git a/lib/Smokeping/probes/CiscoRTTMonDNS.pm b/lib/Smokeping/probes/CiscoRTTMonDNS.pm index c4e2760..bd51fbd 100644 --- a/lib/Smokeping/probes/CiscoRTTMonDNS.pm +++ b/lib/Smokeping/probes/CiscoRTTMonDNS.pm @@ -60,7 +60,7 @@ If you want to be a bit more restrictive with SNMP write access to the router, t The above configuration grants SNMP read-write only to 10.37.3.5 (the smokeping host) and only to the ciscoRttMon MIB tree. The probe does not need access to SNMP variables outside the RttMon tree. DOC bugs => < < @@ -77,7 +77,7 @@ DOC } } -my $pingtimeout =2; +my $pingtimeout = 5; sub new($$$) { @@ -275,6 +275,12 @@ DOC _doc => "The (mandatory) name parameter is the DNS name to resolve.", _example => 'www.foobar.com.au', }, + timeout => { + _re => '\d+', + _example => 15, + _default => $pingtimeout+10, + _doc => "How long a single RTTMonDNS 'ping' take at maximum plus 10 seconds to spare. Since we control our own timeout the only purpose of this is to not have us killed by the ping method from basefork.", + }, iosint => { _doc => < < < @@ -70,7 +70,7 @@ DOC } } -my $pingtimeout =2; +my $pingtimeout = 5; sub new($$$) { @@ -274,6 +274,12 @@ The (optional) port parameter lets you configure the destination TCP port on the host. The default is the http port 80. DOC }, + timeout => { + _re => '\d+', + _example => 15, + _default => $pingtimeout+10, + _doc => "How long a single RTTMon TcpConnect 'ping' take at maximum plus 10 seconds to spare. Since we control our own timeout the only purpose of this is to not have us killed by the ping method from basefork.", + }, iosint => { _example => '10.33.22.11', _doc => <