ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-19 21:42:45 +00:00
Code Packages Projects Releases Wiki Activity

Refactoring. (#415)

Browse Source
This commit is contained in:
Felix Fontein 2022-07-03 13:28:11 +02:00 committed by GitHub
parent 623786c659
commit 9e57f29b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/415-socket-improvements.yml Normal file
View File

@ -0,0 +1,2 @@
minor_changes:
- "socker_handler and socket_helper module utils - improve Python forward compatibilty, create helper functions for file blocking/unblocking (https://github.com/ansible-collections/community.docker/pull/415)."

4
plugins/module_utils/socket_handler.py
View File

@ -10,7 +10,7 @@ import os.path
import socket as pysocket import socket as pysocket
from ansible.module_utils.basic import missing_required_lib from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.six import PY3 from ansible.module_utils.six import PY2
try: try:
from docker.utils import socket as docker_socket from docker.utils import socket as docker_socket
@ -89,7 +89,7 @@ class DockerSocketHandlerBase(object):
return return
else: else:
raise raise
elif PY3 and isinstance(self._sock, getattr(pysocket, 'SocketIO')): elif not PY2 and isinstance(self._sock, getattr(pysocket, 'SocketIO')):
data = self._sock.read() data = self._sock.read()
else: else:
data = os.read(self._sock.fileno()) data = os.read(self._sock.fileno())

14
plugins/module_utils/socket_helper.py
View File

@ -10,7 +10,15 @@ import os
import os.path import os.path
import socket as pysocket import socket as pysocket
from ansible.module_utils.six import PY3 from ansible.module_utils.six import PY2
def make_file_unblocking(file):
fcntl.fcntl(file.fileno(), fcntl.F_SETFL, fcntl.fcntl(file.fileno(), fcntl.F_GETFL) | os.O_NONBLOCK)
def make_file_blocking(file):
fcntl.fcntl(file.fileno(), fcntl.F_SETFL, fcntl.fcntl(file.fileno(), fcntl.F_GETFL) & ~os.O_NONBLOCK)
def make_unblocking(sock): def make_unblocking(sock):
@ -19,7 +27,7 @@ def make_unblocking(sock):
elif hasattr(sock, 'setblocking'): elif hasattr(sock, 'setblocking'):
sock.setblocking(0) sock.setblocking(0)
else: else:
fcntl.fcntl(sock.fileno(), fcntl.F_SETFL, fcntl.fcntl(sock.fileno(), fcntl.F_GETFL) | os.O_NONBLOCK) make_file_unblocking(sock)
def _empty_writer(msg): def _empty_writer(msg):
@ -36,7 +44,7 @@ def shutdown_writing(sock, log=_empty_writer):
# probably: "TypeError: shutdown() takes 1 positional argument but 2 were given" # probably: "TypeError: shutdown() takes 1 positional argument but 2 were given"
log('Shutting down for writing not possible; trying shutdown instead: {0}'.format(e)) log('Shutting down for writing not possible; trying shutdown instead: {0}'.format(e))
sock.shutdown() sock.shutdown()
elif PY3 and isinstance(sock, getattr(pysocket, 'SocketIO')): elif not PY2 and isinstance(sock, getattr(pysocket, 'SocketIO')):
sock._sock.shutdown(pysocket.SHUT_WR) sock._sock.shutdown(pysocket.SHUT_WR)
else: else:
log('No idea how to signal end of writing') log('No idea how to signal end of writing')