1 files changed, 17 insertions, 3 deletions
diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index 0418fa81..f0c41940 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,11 +1,28 @@
 #!/bin/bash 
+
 if [ "`docker ps -a | grep aaf_cass`" == "" ]; then
   docker run --name aaf_cass  -d cassandra:3.11
   echo "aaf_cass Starting"
   echo "Check for running Docker Container aaf_cass, then run again."
+  # we have to exit here so that the calling script can load CQL files
   exit
+else
+  for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+     if [ "`docker container logs aaf_cass | grep 'listening for CQL clients'`" == "" ]; then
+	 	echo "Sleep 10"
+        sleep 10
+     else 
+	 	YESCQL="yes"
+     	break
+     fi
+  done
 fi 
 
+if [ "$YESCQL" == "" ]; then
+  echo "CQL Never started... exiting"
+  exit
+fi
+
 docker exec aaf_cass mkdir -p /opt/app/cass_init
 docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init
 
@@ -20,9 +37,6 @@ echo ""
 echo "The following will give you a temporary identity with which to start working, or emergency"
 echo " cqlsh -u root -p root -f temp_identity.cql"
 echo "Sleeping for 20 seconds"
-sleep 20
-echo "Do a repair, to ensure Cassandra is actually running yet"
-docker exec -it aaf_cass bash -c 'nodetool repair'
 
 echo "Create Keyspaces and Tables"
 docker exec -it aaf_cass bash -c '\