diff options
| author |  Spenser Reinhardt <sreinhardt@nagios.com>
| 2014-01-20 15:30:26 -0600 |
|---|---|---|
| committer |  Jan Wagner <waja@cyconet.org>
| 2014-01-21 11:35:07 +0100 |
| commit | 66544851f7a4f5eeaf86d1cee8b1f54c76f98433 (patch) | |
| tree | 73d010869dd41592e320bf8d50a20b84c8008550 | |
| parent | 80e506a2f72b66dee5c607b4dd42b26f505762dd (diff) | |
| download | monitoring-plugins-66544851f7a4f5eeaf86d1cee8b1f54c76f98433.tar.gz | |
plugins/*.c: Non-network timeout changes
Changes to non-network checks for clarity on timeout value. Adapted from pull request #1209 tracker from user awiddersheim. (Closes: #1209)
Files: check_apt.c, check_disk.c, check_procs.c, negate.c
| -rw-r--r-- | plugins/check_apt.c | 2 | ||||
| -rw-r--r-- | plugins/check_disk.c | 2 | ||||
| -rw-r--r-- | plugins/check_procs.c | 2 | ||||
| -rw-r--r-- | plugins/negate.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index fbba4945..b7ae8f15 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -430,7 +430,7 @@ print_help (void) printf(UT_HELP_VRSN); printf(UT_EXTRA_OPTS); - printf(UT_CONN_TIMEOUT, timeout_interval); + printf(UT_PLUG_TIMEOUT, timeout_interval); printf (" %s\n", "-U, --upgrade=OPTS"); printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 527caa94..05eb970e 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -911,7 +911,7 @@ print_help (void) printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); - printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-u, --units=STRING"); printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); printf (UT_VERBOSE); diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 4646b8a8..4ad2c42e 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -715,7 +715,7 @@ print_help (void) #if defined( __linux__ ) printf (" %s\n", _("ELAPSED - time elapsed in seconds")); #endif /* defined(__linux__) */ - printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-v, --verbose"); printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); diff --git a/plugins/negate.c b/plugins/negate.c index 4eddf244..67a386a8 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -252,7 +252,7 @@ print_help (void) printf (UT_HELP_VRSN); - printf (UT_CONN_TIMEOUT, timeout_interval); + printf (UT_PLUG_TIMEOUT, timeout_interval); printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); printf (" -T, --timeout-result=STATUS\n"); printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); |