cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some handling of log messages from ansible-connection (#50214)

Browse source
This commit is contained in:
Nathaniel Case 2018-12-20 16:38:59 -05:00 committed by GitHub
parent 069e0b8d57
commit 62ec383232
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible-connection
View file

@ -113,6 +113,7 @@ class ConnectionProcess(object):
self.sock.listen(1) self.sock.listen(1)
messages.append(('vvvv', 'local domain socket listeners started successfully')) messages.append(('vvvv', 'local domain socket listeners started successfully'))
except Exception as exc: except Exception as exc:
messages.extend(self.connection.pop_messages())
result['error'] = to_text(exc) result['error'] = to_text(exc)
result['exception'] = traceback.format_exc() result['exception'] = traceback.format_exc()
finally: finally:
@ -304,6 +305,7 @@ def main():
'exception': traceback.format_exc() 'exception': traceback.format_exc()
}) })
if os.path.exists(socket_path):
messages.extend(Connection(socket_path).pop_messages()) messages.extend(Connection(socket_path).pop_messages())
messages.append(('vvvv', sys.stdout.getvalue())) messages.append(('vvvv', sys.stdout.getvalue()))
result.update({ result.update({