upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-02-20 00:10:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

check_tcp: Fix checks without --expect string

Browse source 
Commit e8044713d4 broke check_tcp checks
without --expect string, this commit fixes that regression.
This commit is contained in:
Holger Weiss 2013-09-12 22:36:35 +02:00
parent 7573aa1616
commit ffad261eab
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/check_tcp.c
View file

@ -289,6 +289,8 @@ main (int argc, char **argv)
match_flags)) != NP_MATCH_RETRY)
break;
}
if (match == NP_MATCH_RETRY)
match = NP_MATCH_FAILURE;
/* no data when expected, so return critical */
if (len == 0)
@ -320,7 +322,7 @@ main (int argc, char **argv)
result = STATE_WARNING;
/* did we get the response we hoped? */
if(match != NP_MATCH_SUCCESS && result != STATE_CRITICAL)
if(match == NP_MATCH_FAILURE && result != STATE_CRITICAL)
result = expect_mismatch_state;
/* reset the alarm */
@ -331,10 +333,10 @@ main (int argc, char **argv)
* the response we were looking for. if-else */
printf("%s %s - ", SERVICE, state_text(result));
if(match != NP_MATCH_SUCCESS && len && !(flags & FLAG_HIDE_OUTPUT))
if(match == NP_MATCH_FAILURE && len && !(flags & FLAG_HIDE_OUTPUT))
printf("Unexpected response from host/socket: %s", status);
else {
if(match != NP_MATCH_SUCCESS)
if(match == NP_MATCH_FAILURE)
printf("Unexpected response from host/socket on ");
else
printf("%.3f second response time on ", elapsed_time);
@ -344,13 +346,13 @@ main (int argc, char **argv)
printf("socket %s", server_address);
}
if (match == NP_MATCH_SUCCESS && !(flags & FLAG_HIDE_OUTPUT) && len)
if (match != NP_MATCH_FAILURE && !(flags & FLAG_HIDE_OUTPUT) && len)
printf (" [%s]", status);
/* perf-data doesn't apply when server doesn't talk properly,
* so print all zeroes on warn and crit. Use fperfdata since
* localisation settings can make different outputs */
if(match != NP_MATCH_SUCCESS)
if(match == NP_MATCH_FAILURE)
printf ("|%s",
fperfdata ("time", elapsed_time, "s",
(flags & FLAG_TIME_WARN ? TRUE : FALSE), 0,