Skip to content

fix: ack to the right stream in case of dynamic queue name #102

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 1 commit into from
Oct 7, 2025
Merged

fix: ack to the right stream in case of dynamic queue name #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions taskiq_redis/redis_broker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ async def kick(self, message: BrokerMessage) -> None:
approximate=self.approximate,
)

def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
async def _ack() -> None:
async with Redis(connection_pool=self.connection_pool) as redis_conn:
await redis_conn.xack(
self.queue_name,
queue_name,
self.consumer_group_name,
id,
)
Expand All @@ -287,12 +287,12 @@ async def listen(self) -> AsyncGenerator[AckableMessage, None]:
noack=False,
count=self.count,
)
for _, msg_list in fetched:
for stream, msg_list in fetched:
for msg_id, msg in msg_list:
logger.debug("Received message: %s", msg)
yield AckableMessage(
data=msg[b"data"],
ack=self._ack_generator(msg_id),
ack=self._ack_generator(id=msg_id, queue_name=stream),
)
logger.debug("Starting fetching unacknowledged messages")
for stream in [self.queue_name, *self.additional_streams.keys()]:
Expand All @@ -318,5 +318,5 @@ async def listen(self) -> AsyncGenerator[AckableMessage, None]:
logger.debug("Received message: %s", msg)
yield AckableMessage(
data=msg[b"data"],
ack=self._ack_generator(msg_id),
ack=self._ack_generator(id=msg_id, queue_name=stream),
)
8 changes: 4 additions & 4 deletions taskiq_redis/redis_cluster_broker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ async def kick(self, message: BrokerMessage) -> None:
approximate=self.approximate,
)

def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
async def _ack() -> None:
await self.redis.xack(
self.queue_name,
queue_name,
self.consumer_group_name,
id,
)
Expand All @@ -194,10 +194,10 @@ async def listen(self) -> AsyncGenerator[AckableMessage, None]:
block=self.block,
noack=False,
)
for _, msg_list in fetched:
for stream, msg_list in fetched:
for msg_id, msg in msg_list:
logger.debug("Received message: %s", msg)
yield AckableMessage(
data=msg[b"data"],
ack=self._ack_generator(msg_id),
ack=self._ack_generator(id=msg_id, queue_name=stream),
)
8 changes: 4 additions & 4 deletions taskiq_redis/redis_sentinel_broker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@ async def kick(self, message: BrokerMessage) -> None:
approximate=self.approximate,
)

def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
async def _ack() -> None:
async with self._acquire_master_conn() as redis_conn:
await redis_conn.xack(
self.queue_name,
queue_name,
self.consumer_group_name,
id,
)
Expand All @@ -264,10 +264,10 @@ async def listen(self) -> AsyncGenerator[AckableMessage, None]:
block=self.block,
noack=False,
)
for _, msg_list in fetched:
for stream, msg_list in fetched:
for msg_id, msg in msg_list:
logger.debug("Received message: %s", msg)
yield AckableMessage(
data=msg[b"data"],
ack=self._ack_generator(msg_id),
ack=self._ack_generator(id=msg_id, queue_name=stream),
)
Loading