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

)
raphaelm · Dec 20, 2018 · 62ec383 · 62ec383
1 parent 069e0b8
commit 62ec383
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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,