Skip to content

Commit

Permalink
use ansible json encoding/decoding to avoid errors (ansible#47214)
Browse files Browse the repository at this point in the history
tackle known issues with (de)serializing certain objects
fixes ansible#47200
  • Loading branch information
bcoca authored and ansibot committed Nov 16, 2018
1 parent 86be056 commit 3132266
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions bin/ansible-connection
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ from ansible.module_utils.six import PY3
from ansible.module_utils.six.moves import cPickle, StringIO
from ansible.module_utils.connection import Connection, ConnectionError, send_data, recv_data
from ansible.module_utils.service import fork_process
from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
from ansible.playbook.play_context import PlayContext
from ansible.plugins.loader import connection_loader
from ansible.utils.path import unfrackpath, makedirs_safe
Expand Down Expand Up @@ -115,7 +116,7 @@ class ConnectionProcess(object):
result['exception'] = traceback.format_exc()
finally:
result['messages'] = messages
self.fd.write(json.dumps(result))
self.fd.write(json.dumps(result, cls=AnsibleJSONEncoder))
self.fd.close()

def run(self):
Expand Down Expand Up @@ -275,7 +276,7 @@ def main():
else:
os.close(w)
rfd = os.fdopen(r, 'r')
data = json.loads(rfd.read())
data = json.loads(rfd.read(), cls=AnsibleJSONDecoder)
messages.extend(data.pop('messages'))
result.update(data)

Expand Down Expand Up @@ -306,10 +307,10 @@ def main():
sys.stdout = saved_stdout
if 'exception' in result:
rc = 1
sys.stderr.write(json.dumps(result))
sys.stderr.write(json.dumps(result, cls=AnsibleJSONEncoder))
else:
rc = 0
sys.stdout.write(json.dumps(result))
sys.stdout.write(json.dumps(result, cls=AnsibleJSONEncoder))

sys.exit(rc)

Expand Down

0 comments on commit 3132266

Please sign in to comment.