From dadacf268517da3043a5938c19ec0fcb5f2ca945 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 25 Jul 2023 12:25:33 -0700 Subject: [PATCH] Honor timeouts when possible --- salt/transport/tcp.py | 4 ++-- salt/transport/zeromq.py | 2 +- salt/utils/event.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py index b42da561526..32284e316a4 100644 --- a/salt/transport/tcp.py +++ b/salt/transport/tcp.py @@ -1475,7 +1475,7 @@ class TCPPublishServer(salt.transport.base.DaemonizedPublishServer): async def publish_payload(self, payload, *args): return await self.pub_server.publish_payload(payload) - def connect(self): + def connect(self, timeout=None): self.pub_sock = salt.utils.asynchronous.SyncWrapper( _TCPPubServerPublisher, ( @@ -1485,7 +1485,7 @@ class TCPPublishServer(salt.transport.base.DaemonizedPublishServer): ), loop_kwarg="io_loop", ) - self.pub_sock.connect() + self.pub_sock.connect(timeout=timeout) async def publish(self, payload, **kwargs): """ diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index 7d20aab7031..a1f74e56e61 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -976,7 +976,7 @@ class PublishServer(salt.transport.base.DaemonizedPublishServer): args=(self.publish_payload,), ) - def connect(self): + def connect(self, timeout=None): """ Create and connect this thread's zmq socket. If a publisher socket already exists "pub_close" is called before creating and connecting a diff --git a/salt/utils/event.py b/salt/utils/event.py index e555c037b06..8c786dd5c63 100644 --- a/salt/utils/event.py +++ b/salt/utils/event.py @@ -384,8 +384,7 @@ class SaltEvent: ), ) try: - # self.pusher.connect(timeout=timeout) - self.pusher.connect() + self.pusher.connect(timeout=timeout) self.cpush = True except tornado.iostream.StreamClosedError as exc: log.debug("Unable to connect pusher: %s", exc)