summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNathaniel Case <this.is@nathanielca.se>2018-02-13 12:49:13 -0500
committerGitHub <noreply@github.com>2018-02-13 12:49:13 -0500
commit75528e56bf04970bf3c4f05feda8774286c7cb94 (patch)
treeefb57437c8b85b67ddfb198f0c72bebcaea12d58 /bin
parent14dcf1088268f3b2a91bc2ac67bab68ff6d1540b (diff)
downloadansible-75528e56bf04970bf3c4f05feda8774286c7cb94.tar.gz
Acquire `display`ed messages from forked process (#36064) (#36119)
Also restore verbosity value from loaded `play_context` (cherry picked from commit 527fc492b976d1155fedca7ce7798c141a77796a)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ansible-connection3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/ansible-connection b/bin/ansible-connection
index 68425ff6ba..ed6070b3f0 100755
--- a/bin/ansible-connection
+++ b/bin/ansible-connection
@@ -70,6 +70,7 @@ class ConnectionProcess(object):
self.connection._connect()
self.connection._socket_path = self.socket_path
self.srv.register(self.connection)
+ messages.extend(sys.stdout.getvalue().splitlines())
messages.append('connection to remote device started successfully')
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -189,6 +190,7 @@ def main():
play_context = PlayContext()
play_context.deserialize(pc_data)
+ display.verbosity = play_context.verbosity
except Exception as e:
rc = 1
@@ -278,6 +280,7 @@ def main():
sys.exit(rc)
+
if __name__ == '__main__':
display = Display()
main()