a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix python3 interpreter issue (#34811) (#35176) 

* Fix python3 interpreter issue (#34811)

* Update ansible.module_utils._text (#34811)

* Convert to text later to account for multibyte characters
pull/4420/head
Ravi 2018-03-22 20:59:46 +01:00 committed by Toshio Kuratomi
parent da3f7a8db1
commit 340064bfb9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/modules/net_tools/haproxy.py
View File

@ -193,6 +193,7 @@ import time
from string import Template from string import Template
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_bytes, to_text
DEFAULT_SOCKET_LOCATION = "/var/run/haproxy.sock" DEFAULT_SOCKET_LOCATION = "/var/run/haproxy.sock"
@ -242,13 +243,16 @@ class HAProxy(object):
""" """
self.client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.client.connect(self.socket) self.client.connect(self.socket)
self.client.sendall('%s\n' % cmd) self.client.sendall(to_bytes('%s\n' % cmd))
result = ''
buf = '' result = b''
buf = b''
buf = self.client.recv(RECV_SIZE) buf = self.client.recv(RECV_SIZE)
while buf: while buf:
result += buf result += buf
buf = self.client.recv(RECV_SIZE) buf = self.client.recv(RECV_SIZE)
result = to_text(result, errors='surrogate_or_strict')
if capture_output: if capture_output:
self.capture_command_output(cmd, result.strip()) self.capture_command_output(cmd, result.strip())
self.client.close() self.client.close()