Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zmq publisher keep alive after being opened then closed #112

Merged
merged 1 commit into from
May 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions extensions/ezmsg-zmq/src/ezmsg/zmq/units.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,34 +185,35 @@ async def socket_monitor(self) -> None:
if event == zmq.EVENT_CONNECTED:
self.socket_open = True
elif event == zmq.EVENT_CLOSED:
was_open = self.socket_open
# was_open = self.socket_open
self.socket_open = False
# ZMQ seems to be sending spurious CLOSED event when we
# try to connect before the source is running. Only give up
# if we were previously connected. If we give up now, we
# will never unblock zmq_publisher.
if was_open:
break
elif event in (
zmq.EVENT_DISCONNECTED,
zmq.EVENT_MONITOR_STOPPED,
):
# if was_open:
# break
elif event == zmq.EVENT_DISCONNECTED:
self.socket_open = False
# break
elif event == zmq.EVENT_MONITOR_STOPPED:
self.socket_open = False
break

@ez.publisher(OUTPUT)
async def zmq_publisher(self) -> AsyncGenerator:
# Wait for socket connection
while not self.socket_open:
await asyncio.sleep(POLL_TIME)

while self.socket_open:
poll_result = await self.STATE.socket.poll(
self.SETTINGS.poll_time * 1000, zmq.POLLIN
)
if poll_result:
if self.SETTINGS.multipart is True:
_, data = await self.STATE.socket.recv_multipart()
else:
data = await self.STATE.socket.recv()
yield self.OUTPUT, ZMQMessage(data)
while True:
# Wait for socket connection
if not self.socket_open:
await asyncio.sleep(POLL_TIME)

if self.socket_open:
poll_result = await self.STATE.socket.poll(
self.SETTINGS.poll_time * 1000, zmq.POLLIN
)
if poll_result:
if self.SETTINGS.multipart is True:
_, data = await self.STATE.socket.recv_multipart()
else:
data = await self.STATE.socket.recv()
yield self.OUTPUT, ZMQMessage(data)