Final edits to make integration work again

basice2e/gateway-1.yaml

@@ -9,7 +9,7 @@
 log: "results/gateways/gateway-1.log"
 
 # Log message level
-logLevel: 2
+logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50000"

basice2e/gateway-2.yaml

@@ -9,7 +9,7 @@
 log: "results/gateways/gateway-2.log"
 
 # Log message level
-logLevel: 2
+logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50001"

basice2e/gateway-3.yaml

@@ -9,7 +9,7 @@
 log: "results/gateways/gateway-3.log"
 
 # Log message level
-logLevel: 2
+logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50002"

basice2e/gateway-4.yaml

@@ -9,7 +9,7 @@
 log: "results/gateways/gateway-4.log"
 
 # Log message level
-logLevel: 2
+logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50003"

basice2e/gateway-5.yaml

@@ -9,7 +9,7 @@
 log: "results/gateways/gateway-5.log"
 
 # Log message level
-logLevel: 2
+logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50004"

basice2e/permissioning.yaml

@@ -3,7 +3,7 @@
 # ==================================
 
 # Log message level
-logLevel: 1
+logLevel: 2
 
 # Path to log file
 logPath: "results/permissioning.log"

basice2e/rid.txt

-INFO 2020/06/09 21:26:42 [ObxCt0P+rLWv+0yrCK8v/2x8DXTSBLdN1NKO6YYS930C:50004]: RID 0 ReceiveFinishRealtime END
+INFO 2020/06/10 01:53:31 [ObxCt0P+rLWv+0yrCK8v/2x8DXTSBLdN1NKO6YYS930C:50004]: RID 1 ReceiveFinishRealtime END

basice2e/run.sh

@@ -28,14 +28,6 @@ mkdir -p $GATEWAYLOGS
 mkdir -p $CLIENTOUT
 mkdir -p $CLIENTCLEAN
 
-# Start a user discovery bot server
-echo "STARTING UDB..."
-UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
-$UDBCMD >> $UDBOUT 2>&1 &
-PIDVAL=$!
-echo $PIDVAL >> results/serverpids
-echo "$UDBCMD -- $PIDVAL"
-
 echo "STARTING SERVERS..."
 
 PERMCMD="../bin/permissioning -c permissioning.yaml "
@@ -96,11 +88,21 @@ cnt=0
 echo -n "Waiting for a round to run"
 while [ ! -s rid.txt ] && [ $cnt -lt 120 ]; do
     sleep 1
-    cat results/servers/server-5.log | grep "RID 0 ReceiveFinishRealtime END" > rid.txt || true
+    grep -a "RID 1 ReceiveFinishRealtime END" results/servers/server-5.log > rid.txt || true
     cnt=$(($cnt + 1))
     echo -n "."
 done
 
+# Start a user discovery bot server
+echo "STARTING UDB..."
+UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
+$UDBCMD >> $UDBOUT 2>&1 &
+PIDVAL=$!
+echo $PIDVAL >> results/serverpids
+echo "$UDBCMD -- $PIDVAL"
+
+sleep 5
+
 runclients() {
     echo "Starting clients..."