diff options
| -rw-r--r-- | man/en/sos-report.1 | 3 | ||||
| -rw-r--r-- | sos/report/plugins/__init__.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/man/en/sos-report.1 b/man/en/sos-report.1 index fcf3d020..e7fae97b 100644 --- a/man/en/sos-report.1 +++ b/man/en/sos-report.1 @@ -243,7 +243,8 @@ Specify the number of threads sosreport will use for concurrency. Defaults to 4. .TP .B \--plugin-timeout TIMEOUT Specify a timeout in seconds to allow each plugin to run for. A value of 0 -means no timeout will be set. +means no timeout will be set. A value of -1 is used to indicate the default +timeout of 300 seconds. Note that this options sets the timeout for all plugins. If you want to set a timeout for a specific plugin, use the 'timeout' plugin option available to diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py index 9074625c..02625eb1 100644 --- a/sos/report/plugins/__init__.py +++ b/sos/report/plugins/__init__.py @@ -470,7 +470,8 @@ class Plugin(object): predicate = None cmd_predicate = None _default_plug_opts = [ - ('timeout', 'Timeout in seconds for plugin', 'fast', -1), + ('timeout', 'Timeout in seconds for plugin. The default value (-1) ' + + 'defers to the general plugin timeout, 300 seconds', 'fast', -1), ('postproc', 'Enable post-processing collected plugin data', 'fast', True) ] |