Merge pull request #13 from Hanagotchi/HAN-7

HAN-7: Implementar conexión con RabbitMQ y envío de paquetes

Author: violetaperezandrade

.env.dist

@@ -6,4 +6,5 @@ POSTGRES_PORT=
 QUEUE_NAME=
 LOGGING_LEVEL=
 DATABASE_URL=
-RABBITMQ_HOST=
+RABBITMQ_HOST=
+RABBITMQ_PORT=

Makefile

@@ -2,7 +2,13 @@ default: docker-compose-up
 
 all:
 
-docker-image:
+create-network:
+	@if ! docker network inspect common_network >/dev/null 2>&1; then \
+		docker network create common_network; \
+	fi
+.PHONY: create-network
+
+docker-image: create-network
 	docker build -f ./Dockerfile -t "app:latest" .
 .PHONY: docker-image
 
@@ -17,4 +23,4 @@ docker-compose-down:
 
 docker-compose-logs:
 	docker-compose -f docker-compose.yaml logs -f
-.PHONY: docker-compose-logs
+.PHONY: docker-compose-logs

app/service/common/middleware.py

@@ -5,9 +5,11 @@
 class Middleware:
 
     def __init__(self):
-        self._connection = (pika.BlockingConnection
-                            (pika.ConnectionParameters(host=os.environ.get
-                                                       ("RABBITMQ_HOST"))))
+        rabbitmq_host = os.environ.get("RABBITMQ_HOST", "127.0.0.1")
+        rabbitmq_port = int(os.environ.get("RABBITMQ_PORT", 5672))
+        self._connection = pika.BlockingConnection(
+            pika.ConnectionParameters(host=rabbitmq_host, port=rabbitmq_port)
+        )
         self._channel = self._connection.channel()
         self._exit = False
         self._remake = False

docker-compose.yaml

@@ -1,5 +1,4 @@
 version: '3.9'
-name: measurements
 
 services:
 
@@ -9,6 +8,8 @@ services:
     container_name: app
     env_file:
       - .env
+    networks:
+      - common_network
     ports:
       - "8080:8080"
     depends_on:
@@ -39,6 +40,8 @@ services:
       timeout: 3s
       retries: 10
       start_period: 50s
+    networks:
+      - common_network
 
   sql:
     build:
@@ -69,3 +72,9 @@ services:
       timeout: 3s
       retries: 10
       start_period: 50s
+    networks:
+      - common_network
+      
+networks:
+  common_network:
+    external: true