saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

More test fixes

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-07-04 00:51:44 -07:00 • committed by Gareth J. Greenaway
parent 0ede71eda5
commit 8890635449
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/transport/tcp.py
View file

@ -293,7 +293,7 @@ class TCPPubClient(salt.transport.base.PublishClient):
while stream is None and (not self._closed and not self._closing):
try:
if self.host and self.port:
log.trace(
log.debug(
"PubClient connecting to %r %r:%r", self, self.host, self.port
)
self._tcp_client = TCPClientKeepAlive(
@ -313,7 +313,7 @@ class TCPPubClient(salt.transport.base.PublishClient):
"PubClient conencted to %r %r:%r", self, self.host, self.port
)
else:
log.trace("PubClient connecting to %r %r", self, self.path)
log.debug("PubClient connecting to %r %r", self, self.path)
sock_type = socket.AF_UNIX
stream = tornado.iostream.IOStream(
socket.socket(sock_type, socket.SOCK_STREAM)
@ -382,9 +382,19 @@ class TCPPubClient(salt.transport.base.PublishClient):
framed_msg = salt.transport.frame.decode_embedded_strs(msg)
return framed_msg["body"]
try:
log.error("Stream is %r", self._stream)
events, _, _ = select.select([self._stream.socket], [], [], 0)
except TimeoutError:
events = []
#except TypeError:
# # Stream's socket is closed.
# stream = self._stream
# self._stream = None
# stream.close()
# if self.disconnect_callback:
# self.disconnect_callback()
# await self.connect()
# events = []
if events:
while not self._closing:
await self._read_in_progress.acquire()

3
salt/transport/zeromq.py
View file

@ -1124,8 +1124,9 @@ class RequestClient(salt.transport.base.RequestClient):
await self.sending.acquire()
try:
return await asyncio.wait_for(self._send_recv(load), timeout=timeout)
except TimeoutError:
except (asyncio.exceptions.TimeoutError, TimeoutError):
self.close()
raise
# except Exception:
# self.close()
finally: