diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-03-20 01:40:00 -0400 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-03-20 01:40:00 -0400 |
commit | 4142e178403483d6c1a27e765c0a86e77278c2d6 (patch) | |
tree | faa92535217a63bcfb1d74512686b7347c8ce65d | |
parent | 31f2afcf4a88cc7bb3bff0e7e3e69a810d308634 (diff) | |
download | monitoring-plugins-4142e178403483d6c1a27e765c0a86e77278c2d6.tar.gz |
negate: Fix not printing the real timeout in ALRM handler when timeout is left to default
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | plugins/negate.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -25,6 +25,7 @@ This file documents the major additions and syntax changes between releases. | |||
25 | Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto) | 25 | Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto) |
26 | Fixed check_http sending HTTP/1.0 with v1.1 headers (#2638765) | 26 | Fixed check_http sending HTTP/1.0 with v1.1 headers (#2638765) |
27 | Fixed check_http not timing-out on redirects | 27 | Fixed check_http not timing-out on redirects |
28 | Fixed negate not printing the real timeout in ALRM handler when left to default | ||
28 | 29 | ||
29 | 1.4.13 25th Sept 2008 | 30 | 1.4.13 25th Sept 2008 |
30 | Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) | 31 | Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) |
diff --git a/plugins/negate.c b/plugins/negate.c index 0808b685..e8be83d7 100644 --- a/plugins/negate.c +++ b/plugins/negate.c | |||
@@ -67,6 +67,8 @@ main (int argc, char **argv) | |||
67 | bindtextdomain (PACKAGE, LOCALEDIR); | 67 | bindtextdomain (PACKAGE, LOCALEDIR); |
68 | textdomain (PACKAGE); | 68 | textdomain (PACKAGE); |
69 | 69 | ||
70 | timeout_interval = DEFAULT_TIMEOUT; | ||
71 | |||
70 | command_line = (char **) process_arguments (argc, argv); | 72 | command_line = (char **) process_arguments (argc, argv); |
71 | 73 | ||
72 | /* Set signal handling and alarm */ | 74 | /* Set signal handling and alarm */ |
@@ -242,7 +244,7 @@ print_help (void) | |||
242 | 244 | ||
243 | printf (_(UT_HELP_VRSN)); | 245 | printf (_(UT_HELP_VRSN)); |
244 | 246 | ||
245 | printf (_(UT_TIMEOUT), DEFAULT_TIMEOUT); | 247 | printf (_(UT_TIMEOUT), timeout_interval); |
246 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); | 248 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); |
247 | 249 | ||
248 | printf(" -o, --ok=STATUS\n"); | 250 | printf(" -o, --ok=STATUS\n"); |