diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml index 3b3fd981bd982788cd195a57bf9409df82ca6284..a57e6f3cc516aa4c366bacc3dcbe863cdc00f2b6 100644 --- a/basice2e/gateway-1.yaml +++ b/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" diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml index c1f212446594360f5325171c5cb0147116525fdd..acc4bc264e17da549dfb2ff92e12464168ff2c47 100644 --- a/basice2e/gateway-2.yaml +++ b/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" diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml index 95c3021dd9038548a0af7dffb3b10e8d0920be60..f083ee48c853c3a21c15cb2355980df4737848a0 100644 --- a/basice2e/gateway-3.yaml +++ b/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" diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml index 911300ef662532dd10626f41d5f640723c3e60c3..721ab28ebd4a47af4c1997a12513a93dad47afb9 100644 --- a/basice2e/gateway-4.yaml +++ b/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" diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml index 15a955c5999afad9a51eee8b2e5ce725df008deb..870d5345a17e4cdc1e1030fb197a6ac0af8404c1 100644 --- a/basice2e/gateway-5.yaml +++ b/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" diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml index a13b2ea37b3c5288180144c3c0e320f321d0fd74..ee320426c223638b385bc6865e02710c382cc4ec 100644 --- a/basice2e/permissioning.yaml +++ b/basice2e/permissioning.yaml @@ -3,7 +3,7 @@ # ================================== # Log message level -logLevel: 1 +logLevel: 2 # Path to log file logPath: "results/permissioning.log" diff --git a/basice2e/rid.txt b/basice2e/rid.txt index 93b803a0b090ca52739b8dc3fa232dd5ea148838..adc779777810b80d5001d08f27338743ef8f4d5d 100644 --- a/basice2e/rid.txt +++ b/basice2e/rid.txt @@ -1 +1 @@ -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 diff --git a/basice2e/run.sh b/basice2e/run.sh index 88c25304073a4a61ef3a0cd5012918d851224a07..a3d4b237a60e1cdd7f6740f8d23850cc209c422e 100755 --- a/basice2e/run.sh +++ b/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..."