Merge branch 'master' of https://dev.azure.com/freeleaps/freeleaps-service-hub/_git/freeleaps-service-hub

apps/notification/backend/infra/rabbitmq/async_client.py

@@ -17,7 +17,6 @@ class AsyncMQClient:
         self.process_callable = None
         self.routing_key = self.channel_name
         self.module_logger = ModuleLogger(sender_id="AsyncMQClient")
-        self.connection_url = "amqp://guest:guest@{}:{}/".format(app_settings.RABBITMQ_HOST,app_settings.RABBITMQ_PORT)
     async def bind(self, max_retries=10, event_loop: AbstractEventLoop = None):
         retry_count = 0
         retry_interval = 1  # Start with a 1-second interval
@@ -25,7 +24,8 @@ class AsyncMQClient:
         while retry_count < max_retries:
             try:
                 self.connection = await aio_pika.connect_robust(
-                    self.connection_url,
+                    host=app_settings.RABBITMQ_HOST,
+                    port=int(app_settings.RABBITMQ_PORT),
                     loop=event_loop,
                 )
                 self.channel = await self.connection.channel()

sites/notification/deploy/alpha/.env

@@ -1,4 +1,3 @@
-export RABBITMQ_HOST=if030-w2-if-vm.mathmast.com
 export RABBITMQ_PORT=5672
 export FREELEAPS_ENV=alpha
 

sites/notification/deploy/common/docker-compose.yaml

@@ -1,17 +1,17 @@
 services:
   notification:
     container_name: $APP_NAME
-    build: 
+    build:
       context: ${CODEBASE_ROOT}
       args:
         CONTAINER_APP_ROOT: ${CONTAINER_APP_ROOT}
-    profiles: [prod,alpha,dev]
+    profiles: [ prod, alpha, dev ]
     restart: always
-    environment: 
+    environment:
       - APP_NAME=${APP_NAME}
       - SERVICE_API_ACCESS_HOST=${SERVICE_API_ACCESS_HOST}
       - SERVICE_API_ACCESS_PORT=${SERVICE_API_ACCESS_PORT}
-      - RABBITMQ_HOST=${RABBITMQ_HOST}
+      - RABBITMQ_HOST=freeleaps-rabbitmq
       - RABBITMQ_PORT=${RABBITMQ_PORT}
       - SYSTEM_USER_ID=${SYSTEM_USER_ID}
       - SMS_FROM=${SMS_FROM}
@@ -36,6 +36,20 @@ services:
       - type: bind
         source: $DOCKER_BACKEND_LOG_HOME
         target: $LOG_BASE_PATH
+  rabbitmq:
+    image: rabbitmq:3-management
+    container_name: "freeleaps-rabbitmq"
+    ports:
+      - "5672:5672" # RabbitMQ communication port
+      - "15672:15672" # RabbitMQ management port
+    networks:
+      - devbox_freeleaps2-network
+    healthcheck:
+      test: [ "CMD", "rabbitmq-diagnostics", "ping" ]
+      interval: 30s
+      retries: 5
+      start_period: 10s
+      timeout: 10s
 networks:
   devbox_freeleaps2-network:
-    external: true
+    external: true

sites/notification/deploy/prod/.env

@@ -1,3 +1,2 @@
-export RABBITMQ_HOST=if010-w2-if-vm.mathmast.com
 export RABBITMQ_PORT=5672
 export FREELEAPS_ENV=prod