icecheng/freeleaps-service-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the rabbitmq communication with notification container

Browse Source
This commit is contained in:
jetli 2024-11-05 05:55:48 +00:00
parent c33700fa66
commit 902cca4366
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/notification/backend/infra/rabbitmq/async_client.py
View File

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

1
sites/notification/deploy/alpha/.env
View File

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

16
sites/notification/deploy/common/docker-compose.yaml
View File

@ -11,7 +11,7 @@ services:
- APP_NAME=${APP_NAME} - APP_NAME=${APP_NAME}
- SERVICE_API_ACCESS_HOST=${SERVICE_API_ACCESS_HOST} - SERVICE_API_ACCESS_HOST=${SERVICE_API_ACCESS_HOST}
- SERVICE_API_ACCESS_PORT=${SERVICE_API_ACCESS_PORT} - SERVICE_API_ACCESS_PORT=${SERVICE_API_ACCESS_PORT}
- RABBITMQ_HOST=${RABBITMQ_HOST} - RABBITMQ_HOST=freeleaps-rabbitmq
- RABBITMQ_PORT=${RABBITMQ_PORT} - RABBITMQ_PORT=${RABBITMQ_PORT}
- SYSTEM_USER_ID=${SYSTEM_USER_ID} - SYSTEM_USER_ID=${SYSTEM_USER_ID}
- SMS_FROM=${SMS_FROM} - SMS_FROM=${SMS_FROM}
@ -36,6 +36,20 @@ services:
- type: bind - type: bind
source: $DOCKER_BACKEND_LOG_HOME source: $DOCKER_BACKEND_LOG_HOME
target: $LOG_BASE_PATH 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: networks:
devbox_freeleaps2-network: devbox_freeleaps2-network:
external: true external: true

1
sites/notification/deploy/prod/.env
View File

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