Explorar el Código

healthcheck rabbitmq with curl

Marek Víger hace 3 años
padre
commit
36e2535336
Se han modificado 2 ficheros con 8 adiciones y 6 borrados
  1. 6 6
      compose/bin/setup
  2. 2 0
      compose/env/rabbitmq.env

+ 6 - 6
compose/bin/setup

@@ -31,12 +31,12 @@ bin/clinotty timeout $ES_HEALTHCHECK_TIMEOUT bash -c "
 
 echo ""
 echo "Waiting for connection to RabbitMQ..."
-rabbitmqi=10
-until [ $rabbitmqi -le 0 ]; do
-    printf '.'
-    (( rabbitmqi-- ))
-    sleep 2
-done
+bin/clinotty timeout $RABBITMQ_HEALTHCHECK_TIMEOUT bash -c "
+    until curl --silent --output /dev/null http://$RABBITMQ_DEFAULT_USER:$RABBITMQ_DEFAULT_PASS@$RABBITMQ_HOST:$RABBITMQ_MANAGEMENT_PORT/api/aliveness-test/%2F; do
+        printf '.'
+        sleep 2
+    done"
+[ $? != 0 ] && echo "Failed to connect to RabbitMQ" && exit
 
 bin/clinotty bin/magento setup:install \
   --db-host="$MYSQL_HOST" \

+ 2 - 0
compose/env/rabbitmq.env

@@ -1,6 +1,8 @@
 RABBITMQ_HOST=rabbitmq
 RABBITMQ_PORT=5672
+RABBITMQ_MANAGEMENT_PORT=15672
 RABBITMQ_DEFAULT_USER=magento
 RABBITMQ_DEFAULT_PASS=magento
 RABBITMQ_DEFAULT_VHOST=/
 RABBITMQ_VM_MEMORY_HIGH_WATERMARK=1GB
+RABBITMQ_HEALTHCHECK_TIMEOUT=10