From 26e0bbfdac68ec92e6dbcf4ff0e4ab4ac5b00b85 Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Mon, 13 Dec 2010 19:25:34 -0500
Subject: [PATCH] - More checks to ensure jetty has started before trying to
 check if BigBlueButton web is running

---
 bigbluebutton-config/bin/bbb-conf | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 4f9a7fb513..9ee59d70ad 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -79,7 +79,7 @@ if [ -f /etc/lsb-release ]; then
 			#
 			# Support configuration on Intalio Cloud VM
 			#
-			PLATFORM=ubuntu-intalio
+			PLATFORM=ubuntu-jetty
 			SERVLET_CONTAINER=cloud
 			SERVLET_LOGS=/var/www/cloud/jetty/logs
 			SERVLET_DIR=/var/www/cloud/webappsviacontext
@@ -319,6 +319,19 @@ start_bigbluebutton () {
                 done
         fi
 
+        if [ $PLATFORM == "ubuntu-jetty" ]; then
+                #
+                # Wait until jetty has finished starting before checking for bbb-web
+                #
+                if ! nc -z -w 1 127.0.0.1 8443; then
+                        while ! nc -z -w 1 127.0.0.1 8443; do
+                                echo -n "."
+                                sleep 5
+                        done
+                fi
+        fi
+
+
 	BBB_WEB=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | sed -n '/^bigbluebutton.web.serverURL/{s/.*\///;p}')
         if ! wget http://$BBB_WEB/bigbluebutton/api -O - --quiet | grep -q SUCCESS; then
                 echo "Startup unsuccessful: could not connect to http://$BBB_WEB/bigbluebutton/api"