diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | lib/Smokeping/probes/EchoPingHttp.pm | 6 | ||||
| -rw-r--r-- | lib/Smokeping/probes/EchoPingHttps.pm | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,5 @@ -* create a log entry when there are zero replies from a device. +* fixed echoping test call to be compatible with echoping 6 -- tobi +* create a log entry when there are zero replies from a device. -- tobi * maintaining trunk and branch is not realy sensible the way smokeping evolves. I have merged everything back to trunk -- tobi * Allow several Mailservers to be specified in Mailhost -- tobi 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; |