From 2f571467dd6d7830fcb71126930b417442db6aa8 Mon Sep 17 00:00:00 2001
From: OscarSotoSanchez <oscarsotosanchez@gmail.com>
Date: Tue, 5 May 2020 11:52:00 +0200
Subject: [PATCH] wait for media nodes added to the entrypoint

---
 .../docker/openvidu-server-pro/entrypoint.sh  | 58 ++++++++++++++++++-
 .../docker/openvidu-server/entrypoint.sh      |  8 ++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
index 9b068676..cd9e4514 100755
--- a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
@@ -2,18 +2,72 @@
 
 # Wait for kibana
 if [ ! -z "${WAIT_KIBANA_URL}" ]; then 
+  printf "\n"
+  printf "\n  ======================================="
+  printf "\n  =            WAIT KIBANA              ="
+  printf "\n  ======================================="
+  printf "\n"
+
   while true
   do
-    HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${WAIT_KIBANA_URL})
+    HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" "${WAIT_KIBANA_URL}")
+
+    printf "\n  Waiting for kibana in '%s' URL..." "${WAIT_KIBANA_URL}"
+
     if [ "$HTTP_STATUS" == "200" ]; then
+      printf "\n  ==== Kibana is Ready ===="
       break
     fi
+
     sleep 1
   done
 fi
 
+# Wait for Openvidu Media Nodes
+if [ ! -z "${OPENVIDU_PRO_CLUSTER_MEDIA_NODES_IPS}" ]; then 
+  printf "\n"
+  printf "\n  ======================================="
+  printf "\n  =          WAIT MEDIA NODES           ="
+  printf "\n  ======================================="
+  printf "\n"
+  
+  IFS=','
+  for IP_MEDIANODE in $(echo "${OPENVIDU_PRO_CLUSTER_MEDIA_NODES_IPS}" | sed -e 's/\[//g' -e 's/\]//g' -e 's/"//g' | tr -d '[:space:]')
+  do
+    while true
+    do
+      HTTP_STATUS="$(curl \
+                        --silent \
+                        --no-buffer \
+                        --connect-timeout 2 \
+                        --write-out '%{http_code}' \
+                        --header "Connection: Upgrade" \
+                        --header "Upgrade: websocket" \
+                        --header "Host: 127.0.0.1:8888" \
+                        --header "Origin: 127.0.0.1" \
+                        http://${IP_MEDIANODE}:8888/kurento)"
+
+      printf "\n  Waiting for Media Node with IP: '%s'..." "${IP_MEDIANODE}"
+
+      if [ "$HTTP_STATUS" == "500" ]; then
+        printf "\n  ==== Media Node '%s' is ready ====" "${IP_MEDIANODE}"
+        break
+      fi
+
+      sleep 1
+    done
+  done
+fi
+
+# Launch Openvidu Pro
+printf "\n"
+printf "\n  ======================================="
+printf "\n  =           LAUNCH JAVA               ="
+printf "\n  ======================================="
+printf "\n"
+
 if [ ! -z "${JAVA_OPTIONS}" ]; then
-    echo "Using java options: ${JAVA_OPTIONS}"
+    printf "\n  Using java options: %s" "${JAVA_OPTIONS}"
 fi
 
 java ${JAVA_OPTIONS:-} -jar openvidu-server.jar
diff --git a/openvidu-server/docker/openvidu-server/entrypoint.sh b/openvidu-server/docker/openvidu-server/entrypoint.sh
index 88900a6f..63373adf 100644
--- a/openvidu-server/docker/openvidu-server/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-server/entrypoint.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+printf "\n"
+printf "\n  ======================================="
+printf "\n  =           LAUNCH JAVA               ="
+printf "\n  ======================================="
+printf "\n"
+
 if [ ! -z "${JAVA_OPTIONS}" ]; then
-    echo "Using java options: ${JAVA_OPTIONS}"
+    printf "\n  Using java options: %s" "${JAVA_OPTIONS}"
 fi
 
 java ${JAVA_OPTIONS:-} -jar openvidu-server.jar