ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Add regex to retrieve socket path (#28181)

Browse source
This commit is contained in:
Ganesh Nalawade 2017-08-15 00:17:20 +05:30 • committed by GitHub
parent b5179f9d46
commit c9b2869f06
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/plugins/connection/persistent.py
View file

@ -18,10 +18,10 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import re
import os import os
import pty import pty
import subprocess import subprocess
import sys
from ansible.module_utils._text import to_bytes, to_text from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils.six.moves import cPickle from ansible.module_utils.six.moves import cPickle
@ -66,12 +66,11 @@ class Connection(ConnectionBase):
(stdout, stderr) = p.communicate() (stdout, stderr) = p.communicate()
stdin.close() stdin.close()
return (p, stdout, stderr) return (p.returncode, stdout, stderr)
def exec_command(self, cmd, in_data=None, sudoable=True): def exec_command(self, cmd, in_data=None, sudoable=True):
super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable) super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
p, out, err = self._do_it('EXEC: ' + cmd) return self._do_it('EXEC: ' + cmd)
return p.returncode, out, err
def put_file(self, in_path, out_path): def put_file(self, in_path, out_path):
super(Connection, self).put_file(in_path, out_path) super(Connection, self).put_file(in_path, out_path)
@ -91,16 +90,10 @@ class Connection(ConnectionBase):
socket path exists. If the path exists (or the timeout has expired), socket path exists. If the path exists (or the timeout has expired),
returns the socket path. returns the socket path.
""" """
p, out, err = self._do_it('RUN:') socket_path = None
while True: rc, out, err = self._do_it('RUN:')
out = out.strip() match = re.search(r"#SOCKET_PATH#: (\S+)", out)
if out == b'': if match:
# EOF file found socket_path = to_text(match.group(1).strip(), errors='surrogate_or_strict')
return None
elif out.startswith(b'#SOCKET_PATH#'):
break
else:
out = p.stdout.readline()
socket_path = out.split(b'#SOCKET_PATH#: ', 1)[1] return socket_path
return to_text(socket_path, errors='surrogate_or_strict')