From 135c37adec828ca5a4da4e36a06889458a7cf5d2 Mon Sep 17 00:00:00 2001
From: Olivier Desenfans <desenfans.olivier@gmail.com>
Date: Fri, 28 Apr 2023 18:12:11 +0200
Subject: [PATCH] Fix: always acknowledge MQ message in message websocket

---
 src/aleph/web/controllers/messages.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/aleph/web/controllers/messages.py b/src/aleph/web/controllers/messages.py
index f232f0e96..3eda18589 100644
--- a/src/aleph/web/controllers/messages.py
+++ b/src/aleph/web/controllers/messages.py
@@ -264,10 +264,12 @@ async def messages_ws(request: web.Request) -> web.WebSocketResponse:
     try:
         async with mq_queue.iterator() as queue_iter:
             async for mq_message in queue_iter:
+                # Always acknowledge the message
+                await mq_message.ack()
+
                 if ws.closed:
                     break
 
-                await mq_message.ack()
                 item_hash = aleph_json.loads(mq_message.body)["item_hash"]
                 # A bastardized way to apply the filters on the message as well.
                 # TODO: put the filter key/values in the RabbitMQ message?