Added topic deleting to cloud start script

diff --git a/scripts/iotcloud b/scripts/iotcloud
index 3f570c6..c93a8d1 100755 (executable)
--- a/scripts/iotcloud
+++ b/scripts/iotcloud
@@ -31,6 +31,8 @@ RESOURCEDIRECTORY_DIR=$SERVERS_DIR/resourcedirectory/target
 KAFFKACONF=$KAFKA_DIR/config/server.properties
 
 KAFFKA="$KAFKA_DIR/bin/kafka-server-start.sh -daemon $KAFFKACONF"
+KAFFKA_DELETE_TOPICS="$KAFKA_DIR/bin/kafka-topics.sh --zookeeper 127.0.0.1:2181 --delete --topic .oic.ps.+"
+
 RESOURCEDIRECTORY_JAR="CloudResourceDirectory-0.0.1-SNAPSHOT.jar  5684 127.0.0.1 27017 0"
 ACCOUNT_JAR="CloudAccount-0.0.1-SNAPSHOT.jar                      5685 127.0.0.1 27017 0"
 MESSAGEQUEUE_JAR="CloudMessageQueue-0.0.1-SNAPSHOT.jar            5686 127.0.0.1 2181 127.0.0.1 9092 0"
@@ -138,7 +140,7 @@ start()
        fi
        cat $MQ_PIPE | java -jar $MESSAGEQUEUE_JAR > $LOG_DIR/message_queue.log 2>&1 &
        echo $! >> $PID_FILE
-       sleep 4
+
 ######################################
 #  Interface server start
 ######################################
@@ -150,7 +152,10 @@ start()
        cat $IF_PIPE | java -jar $INTERFACE_JAR > $LOG_DIR/interface.log 2>&1 &
        echo $! >> $PID_FILE
 
-       sleep 10
+       # Delete all topics because MessageQueue server forgot about topics after restart
+       $KAFFKA_DELETE_TOPICS
+
+       sleep 11
        if [ ! -p $SS_PIPE ]; then
            mkfifo $SS_PIPE
        fi