diff options
| author | Nathaniel Case <this.is@nathanielca.se> | 2018-12-21 00:38:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 00:38:59 +0300 |
| commit | 62ec38323212da33a0db7032bf8a0d570cb410aa (patch) | |
| tree | 0aaaf8214a62265afea162c79221b031153cc476 /bin | |
| parent | 069e0b8d577ce0980588635650539ca73da0fe5b (diff) | |
Fix some handling of log messages from ansible-connection (#50214)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ansible-connection | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ansible-connection b/bin/ansible-connection index a09e81e74bf..36d22576216 100755 --- a/bin/ansible-connection +++ b/bin/ansible-connection @@ -113,6 +113,7 @@ class ConnectionProcess(object): self.sock.listen(1) messages.append(('vvvv', 'local domain socket listeners started successfully')) except Exception as exc: + messages.extend(self.connection.pop_messages()) result['error'] = to_text(exc) result['exception'] = traceback.format_exc() finally: @@ -304,7 +305,8 @@ def main(): 'exception': traceback.format_exc() }) - messages.extend(Connection(socket_path).pop_messages()) + if os.path.exists(socket_path): + messages.extend(Connection(socket_path).pop_messages()) messages.append(('vvvv', sys.stdout.getvalue())) result.update({ 'messages': messages, |