diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2007-10-15 09:49:18 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2007-10-15 09:49:18 +0200 |
| commit | 15ce7b9d28dda1afb6b892c1e2a34e057f3fdb60 (patch) | |
| tree | 0226ecb3ea1595463dad24204ac65f9885c4d63b /lib/Smokeping/probes/EchoPingHttp.pm | |
| parent | 03d504e82b3e6c77c0b59af415ff740de1b483f3 (diff) | |
| download | smokeping-15ce7b9d28dda1afb6b892c1e2a34e057f3fdb60.tar.gz smokeping-15ce7b9d28dda1afb6b892c1e2a34e057f3fdb60.tar.xz | |
* fixed parsing of slaves statements in config file, broeken since I seemingly relaxed the hostname constraints.
* removed all online testing from Curl and EchoPing probes
Diffstat (limited to 'lib/Smokeping/probes/EchoPingHttp.pm')
| -rw-r--r-- | lib/Smokeping/probes/EchoPingHttp.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Smokeping/probes/EchoPingHttp.pm b/lib/Smokeping/probes/EchoPingHttp.pm index 7107de6..2f5ea32 100644 --- a/lib/Smokeping/probes/EchoPingHttp.pm +++ b/lib/Smokeping/probes/EchoPingHttp.pm @@ -88,13 +88,13 @@ sub test_usage { my $self = shift; my $bin = $self->{properties}{binary}; croak("Your echoping binary doesn't support HTTP") - if `$bin -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i; - if (`$bin -a -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { + if `$bin -h / 2>&1` !~ /^Usage/; + if (`$bin -a -h / 2>&1` !~ /^Usage/) { carp("Note: your echoping binary doesn't support revalidating (-a), disabling it"); $self->{_disabled}{a} = undef; } - if (`$bin -A -h / 0.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { + if (`$bin -A -h / 2>&1` !~ /^Usage/) { carp("Note: your echoping binary doesn't support ignoring cache (-A), disabling it"); $self->{_disabled}{A} = undef; } |