2022-03-29 18:00:11 +00:00
|
|
|
From 7069e99d1c5c443f96a98a7ed6db67fa14683e67 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
|
|
Date: Thu, 17 Feb 2022 09:14:15 +0100
|
|
|
|
|
Subject: [PATCH] [report] Honor plugins' hardcoded plugin_timeout
|
|
|
|
|
|
|
|
|
|
Currently, plugin's plugin_timeout hardcoded default is superseded by
|
|
|
|
|
whatever --plugin-timeout value, even when this option is not used and
|
|
|
|
|
we eval it to TIMEOUT_DEFAULT.
|
|
|
|
|
|
|
|
|
|
In this case of not setting --plugin-timeout either -k plugin.timeout,
|
|
|
|
|
honour plugin's plugin_timeout instead.
|
|
|
|
|
|
|
|
|
|
Resolves: #2863
|
|
|
|
|
Closes: #2864
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
sos/report/plugins/__init__.py | 5 ++++-
|
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py
|
|
|
|
|
index cc5cb65b..336b4d22 100644
|
|
|
|
|
--- a/sos/report/plugins/__init__.py
|
|
|
|
|
+++ b/sos/report/plugins/__init__.py
|
|
|
|
|
@@ -636,7 +636,10 @@ class Plugin():
|
|
|
|
|
if opt_timeout is None:
|
|
|
|
|
_timeout = own_timeout
|
|
|
|
|
elif opt_timeout is not None and own_timeout == -1:
|
|
|
|
|
- _timeout = int(opt_timeout)
|
|
|
|
|
+ if opt_timeout == TIMEOUT_DEFAULT:
|
|
|
|
|
+ _timeout = default_timeout
|
|
|
|
|
+ else:
|
|
|
|
|
+ _timeout = int(opt_timeout)
|
|
|
|
|
elif opt_timeout is not None and own_timeout > -1:
|
|
|
|
|
_timeout = own_timeout
|
|
|
|
|
else:
|
|
|
|
|
--
|
2022-09-27 20:49:59 +00:00
|
|
|
2.34.3
|
2022-03-29 18:00:11 +00:00
|
|
|
|
