ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ensure async wrapper and status return consistent fields

Browse source
This commit is contained in:
James Cammarata 2016-07-07 13:41:35 -05:00 • committed by Matt Clay
parent 72cd76e023
commit 204e83aeed
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/utilities/logic/async_status.py
View file

@ -76,11 +76,13 @@ def main():
# no remote kill mode currently exists, but probably should
# consider log_path + ".pid" file and also unlink that above
data = file(log_path).read()
data = None
try:
data = file(log_path).read()
import q; q(data)
data = json.loads(data)
except Exception:
if data == '':
if not data:
# file not written yet? That means it is running
module.exit_json(results_file=log_path, ansible_job_id=jid, started=1, finished=0)
else:
@ -90,6 +92,8 @@ def main():
if not 'started' in data:
data['finished'] = 1
data['ansible_job_id'] = jid
elif 'finished' not in data:
data['finished'] = 0
# Fix error: TypeError: exit_json() keywords must be strings
data = dict([(str(k), v) for k, v in data.iteritems()])