From b72de20f968ed8b36880772732b6260312081646 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 6 Oct 2020 14:43:36 +0530 Subject: [PATCH] fix: health check allow redis databases in healthcheck --- build/common/worker/healthcheck.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/common/worker/healthcheck.sh b/build/common/worker/healthcheck.sh index f64d1a49..6fac34b7 100755 --- a/build/common/worker/healthcheck.sh +++ b/build/common/worker/healthcheck.sh @@ -11,8 +11,19 @@ fi # Set REDIS host:port export REDIS_CACHE=`cat $COMMON_SITE_CONFIG_JSON | awk '/redis_cache/ { gsub(/[",]/,"",$2); print $2}' | tr -d '\n' | sed 's|redis://||g'` +if [[ "$REDIS_CACHE" == *"/"* ]]; then + export REDIS_CACHE=`echo $REDIS_CACHE | cut -f1 -d"/"` +fi + export REDIS_QUEUE=`cat $COMMON_SITE_CONFIG_JSON | awk '/redis_queue/ { gsub(/[",]/,"",$2); print $2}' | tr -d '\n' | sed 's|redis://||g'` +if [[ "$REDIS_QUEUE" == *"/"* ]]; then + export REDIS_QUEUE=`echo $REDIS_QUEUE | cut -f1 -d"/"` +fi + export REDIS_SOCKETIO=`cat $COMMON_SITE_CONFIG_JSON | awk '/redis_socketio/ { gsub(/[",]/,"",$2); print $2}' | tr -d '\n' | sed 's|redis://||g'` +if [[ "$REDIS_SOCKETIO" == *"/"* ]]; then + export REDIS_SOCKETIO=`echo $REDIS_SOCKETIO | cut -f1 -d"/"` +fi echo "Check $DB_HOST:$DB_PORT" wait-for-it $DB_HOST:$DB_PORT -t 1