mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
make parsed param private and explicit (#17104)
* make parsed param private and explicit * fixed missed parsed
This commit is contained in:
parent
30268f6bd0
commit
5fe9d3c3d5
2 changed files with 4 additions and 3 deletions
|
@ -594,13 +594,13 @@ class TaskExecutor:
|
|||
# have issues which result in a half-written/unparseable result
|
||||
# file on disk, which manifests to the user as a timeout happening
|
||||
# before it's time to timeout.
|
||||
if int(async_result.get('finished', 0)) == 1 or ('failed' in async_result and async_result.get('parsed', False)) or 'skipped' in async_result:
|
||||
if int(async_result.get('finished', 0)) == 1 or ('failed' in async_result and async_result.get('_ansible_parsed', False)) or 'skipped' in async_result:
|
||||
break
|
||||
|
||||
time_left -= self._task.poll
|
||||
|
||||
if int(async_result.get('finished', 0)) != 1:
|
||||
if async_result.get('parsed'):
|
||||
if async_result.get('_ansible_parsed'):
|
||||
return dict(failed=True, msg="async task did not complete within the requested time")
|
||||
else:
|
||||
return dict(failed=True, msg="async task produced unparseable results", async_result=async_result)
|
||||
|
|
|
@ -670,9 +670,10 @@ class ActionBase(with_metaclass(ABCMeta, object)):
|
|||
def _parse_returned_data(self, res):
|
||||
try:
|
||||
data = json.loads(self._filter_non_json_lines(res.get('stdout', u'')))
|
||||
data['_ansible_parsed'] = True
|
||||
except ValueError:
|
||||
# not valid json, lets try to capture error
|
||||
data = dict(failed=True, parsed=False)
|
||||
data = dict(failed=True, _ansible_parsed=False)
|
||||
data['msg'] = "MODULE FAILURE"
|
||||
data['module_stdout'] = res.get('stdout', u'')
|
||||
if 'stderr' in res:
|
||||
|
|
Loading…
Reference in a new issue