diff options
| author |  Jan Wagner <waja@cyconet.org>
| 2014-06-30 15:02:38 +0200 |
|---|---|---|
| committer | Jan Wagner <waja@cyconet.org>
| 2014-06-30 15:13:39 +0200 |
| commit | b62f2c14fbcec04c021774a9fe0275e395d9eecc (patch) | |
| tree | 24233f99298d32314602a1283dcecbcf9ce35a58 /plugins | |
| parent | ed914472e92157ef8a304d8c2916058f24c7c964 (diff) | |
| parent | 4277f47bffb65bafeb9b8e256dd7116ce747e850 (diff) | |
| download | monitoring-plugins-b62f2c14fbcec04c021774a9fe0275e395d9eecc.tar.gz | |
Merge PR #1265 from waja/check_tcp_server_addr
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_tcp.c | 9 | ||||
| -rw-r--r-- | plugins/t/check_jabber.t | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index ebdccd1b..bd7736b5 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -353,8 +353,13 @@ main (int argc, char **argv) printf("Unexpected response from host/socket on "); else printf("%.3f second response time on ", elapsed_time); - if(server_address[0] != '/') - printf("port %d", server_port); + if(server_address[0] != '/') { + if (host_specified) + printf("%s port %d", + server_address, server_port); + else + printf("port %d", server_port); + } else printf("socket %s", server_address); } diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t index 1aaf8125..7a708d5b 100644 --- a/plugins/t/check_jabber.t +++ b/plugins/t/check_jabber.t @@ -29,7 +29,7 @@ my $hostname_invalid = getTestParameter( ); -my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on port 5222/'; +my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on '.$host_tcp_jabber.' port 5222/'; my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/'; @@ -40,7 +40,7 @@ my $r; SKIP: { skip "No jabber server defined", 6 unless $host_tcp_jabber; - $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber" ); + $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber" ); is( $r->return_code, 0, "Connected okay"); like( $r->output, $jabberOK, "Output as expected" ); @@ -48,7 +48,7 @@ SKIP: { is( $r->return_code, 0, "Connected okay, within limits" ); like( $r->output, $jabberOK, "Output as expected" ); - $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber -wt 9 -ct 9 -to 10" ); + $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber -wt 9 -ct 9 -to 10" ); is( $r->return_code, 0, "Old syntax okay" ); like( $r->output, $jabberOK, "Output as expected" ); |