diff options
| author | Nathaniel Case <this.is@nathanielca.se> | 2018-02-13 16:59:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 16:59:37 +0100 |
| commit | 527fc492b976d1155fedca7ce7798c141a77796a (patch) | |
| tree | fea0abbdfb2aac9f53a1358f72d7d87db66c02a3 /bin | |
| parent | Upgrade to openshift client 0.4.0 (#35127) (diff) | |
| download | ansible-527fc492b976d1155fedca7ce7798c141a77796a.tar.xz ansible-527fc492b976d1155fedca7ce7798c141a77796a.zip | |
Acquire `display`ed messages from forked process (#36064)
Also restore verbosity value from loaded `play_context`
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ansible-connection | 3 |
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() |