Limit rabbitmq prefetch and use default rabbitmq (#180)

* Limit rabbitmq prefetch and use default rabbitmq Shouldn't need to increase the timeout for rabbitmq * Use default rabbitmq everywhere * Don't prefetch messages
SAFEHR-data · Dec 13, 2023 · 08ac69c · 08ac69c
1 parent a86fbe1
commit 08ac69c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 27 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -199,11 +199,7 @@ services:
     restart: "no"
 
   queue:
-    build:
-      context: .
-      dockerfile: ./docker/queue/Dockerfile
-      args:
-        <<: *build-args-common
+    image: rabbitmq:3.11.2-management
     environment:
       RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}

diff --git a/docker/queue/Dockerfile b/docker/queue/Dockerfile
diff --git a/pixl_core/src/core/patient_queue/subscriber.py b/pixl_core/src/core/patient_queue/subscriber.py
@@ -47,6 +47,8 @@ async def __aenter__(self) -> "PixlConsumer":
         """Establishes connection to queue."""
         self._connection = await aio_pika.connect_robust(self._url)
         self._channel = await self._connection.channel()
+        # Don't prefetch messages
+        await self._channel.set_qos(prefetch_count=1)
         self._queue = await self._channel.declare_queue(self.queue_name)
         return self
 

diff --git a/pixl_core/tests/docker-compose.yml b/pixl_core/tests/docker-compose.yml
@@ -18,9 +18,6 @@ services:
 
   queue:
     container_name: pixl-test-queue
-    build:
-      context: ../..
-      dockerfile: docker/queue/Dockerfile
     image: rabbitmq:3.11.2-management
     environment:
       RABBITMQ_DEFAULT_USER: guest

diff --git a/pixl_pacs/tests/docker-compose.yml b/pixl_pacs/tests/docker-compose.yml
@@ -115,9 +115,7 @@ services:
 
   queue:
     container_name: pixl-test-queue
-    build:
-      context: ../..
-      dockerfile: docker/queue/Dockerfile
+    image: rabbitmq:3.11.2-management
     healthcheck:
       test: rabbitmq-diagnostics -q ping
       interval: 30s