Jelajahi Sumber

Merge pull request #434 from fraff/master

 Improve handling of --input-file
Sebastian Wolf 6 tahun lalu
induk
melakukan
dbe9e84078
1 mengubah file dengan 9 tambahan dan 3 penghapusan
  1. 9 3
      plugins/check_procs.c

+ 9 - 3
plugins/check_procs.c

@@ -201,16 +201,17 @@ main (int argc, char **argv)
 	}
 	(void) alarm ((unsigned) timeout_interval);
 
-	if (verbose >= 2)
-		printf (_("CMD: %s\n"), PS_COMMAND);
-
 	if (input_filename == NULL) {
+	    if (verbose >= 2)
+		    printf (_("CMD: %s\n"), PS_COMMAND);
 		result = cmd_run( PS_COMMAND, &chld_out, &chld_err, 0);
 		if (chld_err.lines > 0) {
 			printf ("%s: %s", _("System call sent warnings to stderr"), chld_err.line[0]);
 			exit(STATE_WARNING);
 		}
 	} else {
+	    if (verbose >= 2)
+		    printf (_("INPUT FILE: %s\n"), input_filename);
 		result = cmd_file_read( input_filename, &chld_out, 0);
 	}
 
@@ -843,6 +844,11 @@ print_help (void)
   printf (" %s\n", "-g, --cgroup-hierarchy");
   printf ("   %s\n", _("Only scan for processes belonging to STRING hierarchy (works on Linux only)."));
 
+  printf ("\n");
+	printf ("%s\n", "Extra:");
+  printf (" %s\n", "--input-file=FILE");
+  printf ("   %s\n", _("Use FILE content instead of /bin/ps output."));
+
 	printf(_("\n\
 RANGEs are prefixed with @ and specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\
 specified 'max:min', a warning status will be generated if the\n\