Selaa lähdekoodia

Fixes #685 check_by_ssh should return UNKNOWN, not CRITICAL, on timeout

Paul B. Henson 3 vuotta sitten
vanhempi
commit
9011730585
1 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 7 1
      plugins/check_by_ssh.c

+ 7 - 1
plugins/check_by_ssh.c

@@ -182,6 +182,7 @@ process_arguments (int argc, char **argv)
 		{"services", required_argument, 0, 's'},
 		{"identity", required_argument, 0, 'i'},
 		{"user", required_argument, 0, 'u'},
+		{"unknown-timeout", no_argument, 0, 'U'},
 		{"logname", required_argument, 0, 'l'},
 		{"command", required_argument, 0, 'C'},
 		{"skip", optional_argument, 0, 'S'}, /* backwards compatibility */
@@ -205,7 +206,7 @@ process_arguments (int argc, char **argv)
 			strcpy (argv[c], "-t");
 
 	while (1) {
-		c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
+		c = getopt_long (argc, argv, "Vvh1246fUqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
 		                 &option);
 
 		if (c == -1 || c == EOF)
@@ -324,6 +325,9 @@ process_arguments (int argc, char **argv)
 			comm_append("-F");
 			comm_append(optarg);
 			break;
+		case 'U': 									/* return UNKNOWN on timeout */
+			timeout_state=STATE_UNKNOWN;
+			break;
 		default:									/* help */
 			usage5();
 		}
@@ -440,6 +444,8 @@ print_help (void)
   printf ("    %s\n", _("Tell ssh to use this configfile [optional]"));
   printf (" %s\n","-q, --quiet");
   printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
+  printf (" %s\n", "-U, --unknown-timeout");
+  printf ("    %s\n", _("Return UNKNOWN on timeouts"));
 	printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 	printf (UT_VERBOSE);
 	printf("\n");