diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2006-08-30 10:34:16 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2006-08-30 10:34:16 +0200 |
| commit | a8e660624f549afabf3b175107263693a3aca454 (patch) | |
| tree | 86ad68658f45b7eb9b203501ba6f71b70562275c /lib/Smokeping | |
| parent | dd3accda13569f43b6aa83025698a3a247b2c5a1 (diff) | |
| download | smokeping-a8e660624f549afabf3b175107263693a3aca454.tar.gz smokeping-a8e660624f549afabf3b175107263693a3aca454.tar.xz | |
fixed compatibility with newer echoping versions
Diffstat (limited to 'lib/Smokeping')
| -rw-r--r-- | lib/Smokeping/probes/EchoPingHttp.pm | 6 | ||||
| -rw-r--r-- | lib/Smokeping/probes/EchoPingHttps.pm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Smokeping/probes/EchoPingHttp.pm b/lib/Smokeping/probes/EchoPingHttp.pm index 570ab66..beb7d4b 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/ 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i; - if (`$bin -a -h/ 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { + if `$bin -h / 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i; + if (`$bin -a -h / 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { carp("Note: your echoping binary doesn't support revalidating (-a), disabling it"); $self->{_disabled}{a} = undef; } - if (`$bin -A -h/ 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { + if (`$bin -A -h / 127.0.0.1 2>&1` =~ /(invalid option|not compiled|usage)/i) { carp("Note: your echoping binary doesn't support ignoring cache (-A), disabling it"); $self->{_disabled}{A} = undef; } diff --git a/lib/Smokeping/probes/EchoPingHttps.pm b/lib/Smokeping/probes/EchoPingHttps.pm index 629400e..8800592 100644 --- a/lib/Smokeping/probes/EchoPingHttps.pm +++ b/lib/Smokeping/probes/EchoPingHttps.pm @@ -54,7 +54,7 @@ sub test_usage { my $self = shift; my $bin = $self->{properties}{binary}; - my $response = `$bin -C -h/ 127.0.0.1 2>&1`; + my $response = `$bin -C -h / 127.0.0.1 2>&1`; croak("Your echoping binary doesn't support SSL") if ($response =~ /(not compiled|invalid option|usage)/i); $self->SUPER::test_usage; |