From 987efbaee48f24fd0200c41b362f8327e68782eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20G=C3=B6ransson?= Date: Thu, 14 Nov 2024 16:06:07 +0100 Subject: [PATCH] revert zmq changes --- grizzly/tasks/clients/messagequeue.py | 4 +--- grizzly/tasks/clients/servicebus.py | 6 ++---- grizzly/users/messagequeue.py | 4 +--- grizzly/users/servicebus.py | 4 +--- grizzly_extras/async_message/daemon.py | 2 -- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/grizzly/tasks/clients/messagequeue.py b/grizzly/tasks/clients/messagequeue.py index b8dc37df..92f099f9 100644 --- a/grizzly/tasks/clients/messagequeue.py +++ b/grizzly/tasks/clients/messagequeue.py @@ -146,7 +146,7 @@ def __init__( self.create_context() - self._zmq_context = zmq.Context.instance() + self._zmq_context = zmq.Context() self._worker = {} self.max_message_size = None @@ -248,8 +248,6 @@ def create_client(self, parent: GrizzlyScenario) -> Generator[ztypes.Socket, Non ztypes.Socket, self._zmq_context.socket(zmq.REQ), ) - client.setsockopt(zmq.REQ_RELAXED, 1) - client.setsockopt(zmq.REQ_CORRELATE, 1) client.setsockopt(zmq.LINGER, 0) client.connect(self._zmq_url) diff --git a/grizzly/tasks/clients/servicebus.py b/grizzly/tasks/clients/servicebus.py index 1f1e826c..2864d8f5 100644 --- a/grizzly/tasks/clients/servicebus.py +++ b/grizzly/tasks/clients/servicebus.py @@ -273,7 +273,7 @@ def __init__( # noqa: PLR0915 self.context.update({'content_type': content_type}) self._state = {} - self._zmq_context = zmq.Context.instance() + self._zmq_context = zmq.Context() def get_state(self, parent: GrizzlyScenario) -> State: state = self._state.get(parent, None) @@ -298,15 +298,13 @@ def get_state(self, parent: GrizzlyScenario) -> State: # context might have been destroyed as all existing sockets has been closed if self._zmq_context.closed: - self._zmq_context = zmq.Context.instance() + self._zmq_context = zmq.Context() state = State( parent=parent, client=cast(ztypes.Socket, self._zmq_context.socket(zmq.REQ)), context=context, ) - state.client.setsockopt(zmq.REQ_RELAXED, 1) - state.client.setsockopt(zmq.REQ_CORRELATE, 1) state.client.setsockopt(zmq.LINGER, 0) state.client.connect(self._zmq_url) self._state.update({parent: state}) diff --git a/grizzly/users/messagequeue.py b/grizzly/users/messagequeue.py index 7cf83a66..b05aed44 100644 --- a/grizzly/users/messagequeue.py +++ b/grizzly/users/messagequeue.py @@ -177,7 +177,7 @@ class MessageQueueUser(GrizzlyUser): am_context: AsyncMessageContext worker_id: Optional[str] - zmq_context = zmq.Context.instance() + zmq_context = zmq.Context() zmq_client: ztypes.Socket zmq_url = 'tcp://127.0.0.1:5554' @@ -281,8 +281,6 @@ def on_start(self) -> None: 'context': self.am_context, }): self.zmq_client = self.zmq_context.socket(zmq.REQ) - self.zmq_client.setsockopt(zmq.REQ_RELAXED, 1) - self.zmq_client.setsockopt(zmq.REQ_CORRELATE, 1) self.zmq_client.setsockopt(zmq.LINGER, 0) self.zmq_client.connect(self.zmq_url) except Exception as e: diff --git a/grizzly/users/servicebus.py b/grizzly/users/servicebus.py index 276e0d86..50f180b3 100644 --- a/grizzly/users/servicebus.py +++ b/grizzly/users/servicebus.py @@ -119,7 +119,7 @@ class ServiceBusUser(GrizzlyUser): am_context: AsyncMessageContext worker_id: Optional[str] - zmq_context = zmq.Context.instance() + zmq_context = zmq.Context() zmq_client: ztypes.Socket zmq_url = 'tcp://127.0.0.1:5554' hellos: set[str] @@ -193,8 +193,6 @@ def on_start(self) -> None: super().on_start() self.zmq_client = self.zmq_context.socket(zmq.REQ) - self.zmq_client.setsockopt(zmq.REQ_RELAXED, 1) - self.zmq_client.setsockopt(zmq.REQ_CORRELATE, 1) self.zmq_client.setsockopt(zmq.LINGER, 0) self.zmq_client.connect(self.zmq_url) diff --git a/grizzly_extras/async_message/daemon.py b/grizzly_extras/async_message/daemon.py index ad496fd5..8a7ae3ca 100644 --- a/grizzly_extras/async_message/daemon.py +++ b/grizzly_extras/async_message/daemon.py @@ -62,8 +62,6 @@ def __init__(self, context: ztypes.Context, identity: str, event: Optional[Event self.integration = None self._event = Event() if event is None else event self.socket = self.context.socket(zmq.REQ) - self.socket.setsockopt(zmq.REQ_RELAXED, 1) - self.socket.setsockopt(zmq.REQ_CORRELATE, 1) self.socket.setsockopt_string(zmq.IDENTITY, self.identity) self.socket.connect('inproc://workers') self.socket.send_string(LRU_READY)