summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorGanesh Nalawade <ganesh634@gmail.com>2017-08-01 16:02:25 +0200
committerGitHub <noreply@github.com>2017-08-01 16:02:25 +0200
commitbb998a3cd23ca3282cce2701ef004c08f6571655 (patch)
tree383d6eec38377e5eb179c11df33e8193e8f22281 /bin
parentImprove fish environment setup (#26151) (diff)
downloadansible-bb998a3cd23ca3282cce2701ef004c08f6571655.tar.xz
ansible-bb998a3cd23ca3282cce2701ef004c08f6571655.zip
Add fix to read correct socket path recieved from ansible-connection (#27560)
Currently socket path is send from `ansible-connection` (running as background process) over stdout. This can conflict with debug logs that are also send on stdout resulting in incorrect socket path received by the main process. To avoid this add a socket path delimiter string which is recevied by main process and socket path is retrieved based on delimiter string. This implementation will change in future when ansible-connection framework is made more robust.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ansible-connection2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ansible-connection b/bin/ansible-connection
index 8e9114817c..fde1883e1f 100755
--- a/bin/ansible-connection
+++ b/bin/ansible-connection
@@ -249,7 +249,7 @@ class Server():
break
time.sleep(1)
timeout -= 1
- return (0, self.socket_path, '')
+ return 0, b'\n#SOCKET_PATH#: %s\n' % self.socket_path, ''
def communicate(sock, data):