Skip to content

Fix acks not on ActiveMQ Artemis: use ack MESSAGE frame header, not message-id #92

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Fix acks not on ActiveMQ Artemis: use ack MESSAGE frame header, not message-id #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66d65f4
Reapply "Use `ack`, not `message-id` for acking/nacking to support ac…
vrslev Nov 5, 2024
de61139
Reapply "Fix tests"
vrslev Nov 5, 2024
797e070
Merge branch 'main' into fix-acks-on-activemq-classic
vrslev Nov 5, 2024
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
18 changes: 12 additions & 6 deletions stompman/subscription.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,24 @@ async def _run_handler(self, *, frame: MessageFrame) -> None:
try:
await self.handler(frame)
except self.suppressed_exception_classes as exception:
if self._should_handle_ack_nack and self.id in self._active_subscriptions:
if (
self._should_handle_ack_nack
and self.id in self._active_subscriptions
and (ack_id := frame.headers["ack"])
):
await self._connection_manager.maybe_write_frame(
NackFrame(
headers={"id": frame.headers["message-id"], "subscription": frame.headers["subscription"]}
)
NackFrame(headers={"id": ack_id, "subscription": frame.headers["subscription"]})
)
self.on_suppressed_exception(exception, frame)
else:
if self._should_handle_ack_nack and self.id in self._active_subscriptions:
if (
self._should_handle_ack_nack
and self.id in self._active_subscriptions
and (ack_id := frame.headers["ack"])
):
await self._connection_manager.maybe_write_frame(
AckFrame(
headers={"id": frame.headers["message-id"], "subscription": frame.headers["subscription"]},
headers={"id": ack_id, "subscription": frame.headers["subscription"]},
)
)

Expand Down
8 changes: 4 additions & 4 deletions tests/test_subscription.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ async def test_client_listen_unsubscribe_before_ack_or_nack(
async def test_client_listen_ack_nack_sent(
monkeypatch: pytest.MonkeyPatch, faker: faker.Faker, ack: AckMode, *, ok: bool
) -> None:
subscription_id, destination, message_id = faker.pystr(), faker.pystr(), faker.pystr()
subscription_id, destination, ack_id = faker.pystr(), faker.pystr(), faker.pystr()
monkeypatch.setattr(stompman.subscription, "_make_subscription_id", mock.Mock(return_value=subscription_id))

message_frame = build_dataclass(
MessageFrame, headers={"destination": destination, "message-id": message_id, "subscription": subscription_id}
MessageFrame, headers={"destination": destination, "ack": ack_id, "subscription": subscription_id}
)
connection_class, collected_frames = create_spying_connection(*get_read_frames_with_lifespan([message_frame]))
message_handler = mock.AsyncMock(side_effect=None if ok else SomeError)
Expand All @@ -244,9 +244,9 @@ async def test_client_listen_ack_nack_sent(
assert collected_frames == enrich_expected_frames(
SubscribeFrame(headers={"id": subscription_id, "destination": destination, "ack": ack}),
message_frame,
AckFrame(headers={"id": message_id, "subscription": subscription_id})
AckFrame(headers={"id": ack_id, "subscription": subscription_id})
if ok
else NackFrame(headers={"id": message_id, "subscription": subscription_id}),
else NackFrame(headers={"id": ack_id, "subscription": subscription_id}),
UnsubscribeFrame(headers={"id": subscription_id}),
)

Expand Down