소스 검색

More diagnostic messages from check_ping

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1216 f882894a-f735-0410-b71e-b25c423dba1c
Ton Voon 20 년 전
부모
커밋
31c5bbba7e
1개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8 5
      plugins/check_ping.c

+ 8 - 5
plugins/check_ping.c

@@ -53,7 +53,7 @@ char **addresses = NULL;
 int n_addresses;
 int max_addr = 1;
 int max_packets = -1;
-int verbose = FALSE;
+int verbose = 0;
 
 float rta = UNKNOWN_TRIP_TIME;
 int pl = UNKNOWN_PACKET_LOSS;
@@ -112,8 +112,8 @@ main (int argc, char **argv)
 		asprintf (&cmd, rawcmd, addresses[i], max_packets);
 #endif
 
-		if (verbose)
-			printf ("%s ==> ", cmd);
+		if (verbose >= 2)
+			printf ("CMD: %s\n", cmd);
 
 		/* run the command */
 		this_result = run_ping (cmd, addresses[i]);
@@ -146,7 +146,7 @@ main (int argc, char **argv)
 			printf ("</A>");
 		printf ("\n");
 
-		if (verbose)
+		if (verbose >= 2)
 			printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
 
 		result = max_state (result, this_result);
@@ -208,7 +208,7 @@ process_arguments (int argc, char **argv)
 			timeout_interval = atoi (optarg);
 			break;
 		case 'v':	/* verbose mode */
-			verbose = TRUE;
+			verbose++;
 			break;
 		case '4':	/* IPv4 only */
 			address_family = AF_INET;
@@ -412,6 +412,9 @@ run_ping (const char *cmd, const char *addr)
 
 	while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
 
+		if (verbose >= 3)
+			printf("Output: %s", buf);
+
 		result = max_state (result, error_scan (buf, addr));
 
 		/* get the percent loss statistics */