summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonvoon <ton.voon@opsera.com>2010-04-15 08:31:45 (GMT)
committertonvoon <ton.voon@opsera.com>2010-04-15 08:31:45 (GMT)
commita625872ee35399c0ff69d95d8695feecaab7e79c (patch)
tree5db2e306343503078d730ddecca81bfaa46461fd
parentc128d293b015291c5e45637d9e3d5b1e1fb36c12 (diff)
downloadmonitoring-plugin-perl-a625872ee35399c0ff69d95d8695feecaab7e79c.tar.gz
Updated --extra-opts help text. Pod fix (Frank Wiegand - RT51872)
-rw-r--r--Changes4
-rw-r--r--lib/Nagios/Plugin.pm2
-rw-r--r--lib/Nagios/Plugin/Getopt.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/Changes b/Changes
index 1679d1c..64b8a56 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
1Revision history for Perl module Nagios::Plugin. 1Revision history for Perl module Nagios::Plugin.
2 2
30.34 15th April 2010
4 - Amended standard --extra-opts help
5 - pod fix (Frank Wiegand - RT51872)
6
30.33 5th June 2009 70.33 5th June 2009
4 - Fixed infinite loop when invalid performance data with multiple = were present 8 - Fixed infinite loop when invalid performance data with multiple = were present
5 9
diff --git a/lib/Nagios/Plugin.pm b/lib/Nagios/Plugin.pm
index 82bbfcb..cdc3ef8 100644
--- a/lib/Nagios/Plugin.pm
+++ b/lib/Nagios/Plugin.pm
@@ -507,7 +507,7 @@ WARNING constant. The thresholds may be:
5072. explicitly set by calling C<set_thresholds()> before C<check_threshold()>, or, 5072. explicitly set by calling C<set_thresholds()> before C<check_threshold()>, or,
508 508
5093. implicitly set by command-line parameters -w, -c, --critical or 5093. implicitly set by command-line parameters -w, -c, --critical or
510 --warning, if you have run C<$plugin->getopts()>. 510 --warning, if you have run C<< $plugin->getopts() >>.
511 511
512The return value is ready to pass to C <nagios_exit>, e . g ., 512The return value is ready to pass to C <nagios_exit>, e . g .,
513 513
diff --git a/lib/Nagios/Plugin/Getopt.pm b/lib/Nagios/Plugin/Getopt.pm
index 0cf8f73..14aab03 100644
--- a/lib/Nagios/Plugin/Getopt.pm
+++ b/lib/Nagios/Plugin/Getopt.pm
@@ -38,7 +38,7 @@ my @ARGS = ({
38 help => "-V, --version\n Print version information", 38 help => "-V, --version\n Print version information",
39 }, { 39 }, {
40 spec => 'extra-opts:s@', 40 spec => 'extra-opts:s@',
41 help => "--extra-opts=[<section>[@<config_file>]]\n Section and/or config_file from which to load extra options (may repeat)", 41 help => "--extra-opts=[section][\@file]\n Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage",
42 }, { 42 }, {
43 spec => 'timeout|t=i', 43 spec => 'timeout|t=i',
44 help => "-t, --timeout=INTEGER\n Seconds before plugin times out (default: %s)", 44 help => "-t, --timeout=INTEGER\n Seconds before plugin times out (default: %s)",