Skip to content
Snippets Groups Projects
Commit c2cf773c authored by Rick Carback's avatar Rick Carback
Browse files

Merge remote-tracking branch 'origin/release' into XX-1813/make_logging_great_again

parents aa80ff36 f1bb6331
No related branches found
No related tags found
No related merge requests found
......@@ -76,6 +76,7 @@ installbinaries:
- bin/gateway --version
artifacts:
when: always
expire_in: '1 day'
paths:
- bin/
......@@ -90,6 +91,7 @@ basice2e:
- cd ..
artifacts:
when: always
expire_in: '1 day'
paths:
- basice2e/results/
- bin/
......@@ -112,6 +114,7 @@ basice2e:
# - cd ..
# artifacts:
# when: always
# expire_in: '1 day'
# paths:
# - basice2e/
# - bin/
......@@ -127,6 +130,7 @@ smokeinfra:
- cd ..
artifacts:
when: always
expire_in: '1 day'
paths:
- smokeinfra/results/
- bin/
......@@ -145,6 +149,7 @@ smokeinfraBatch4:
- cd ..
artifacts:
when: always
expire_in: '1 day'
paths:
- smokeinfra/results/
- bin/
......@@ -162,6 +167,7 @@ smokeinfraBatch4:
# - cd ..
# artifacts:
# when: always
# expire_in: '1 day'
# paths:
# - smokeinfra/results/
# - bin/
......@@ -176,6 +182,7 @@ benchmark:
- ./bin/server benchmark -b 1024 -n 5 -i 1
artifacts:
when: always
expire_in: '1 day'
paths:
- bin/
only:
......
Message from 9, Spencer Received: Hello, 18, with E2E Encryption
Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
Received: Hello, 18, with E2E Encryption
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption
Hello from Rick42, with E2E Encryption
Received: Hello from Ben43, with E2E Encryption
Sending Message to 0, : Hello from Rick42, with E2E Encryption
Hello from Ben43, with E2E Encryption
Received: Hello from Rick42, with E2E Encryption
Sending Message to 0, : Hello from Ben43, with E2E Encryption
Message from 7, Rick Received: Hello, 4
Received: Hello, 4
Sending Message to 5, Ben: Hello, 5
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
Message from 4, Jim Received: Hello, 5
Received: Hello, 5
Sending Message to 6, Steph: Hello, 6
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
Message from 5, Ben Received: Hello, 6
Received: Hello, 6
Sending Message to 7, Rick: Hello, 7
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
Message from 6, Steph Received: Hello, 7
Received: Hello, 7
Sending Message to 4, Jim: Hello, 4
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
Received: Hello, 9, with E2E Encryption
Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption
......@@ -42,15 +42,12 @@ for SERVERID in $(seq 5 -1 1)
do
IDX=$(($SERVERID - 1))
SERVERCMD="../bin/server -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
if [ $SERVERID -eq 4 ]; then
sleep 15 # This will force a CDE timeout
fi
$SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 &
PIDVAL=$!
echo "$SERVERCMD -- $PIDVAL"
done
sleep 15 # Give servers some time to boot
sleep 15
# Start gateways
for GWID in $(seq 5 -1 1)
......@@ -62,7 +59,6 @@ do
echo "$GATEWAYCMD -- $PIDVAL"
done
jobs -p > results/serverpids
finish() {
......@@ -81,7 +77,7 @@ finish() {
trap finish EXIT
trap finish INT
sleep 30 # FIXME: We should not need this, but the servers don't respond quickly
sleep 120 # FIXME: We should not need this, but the servers don't respond quickly
# enough on boot right now.
runclients() {
......@@ -212,15 +208,20 @@ for C in $(ls -1 $CLIENTOUT); do
done
# only expect up to 10c messages from the e2e clients
head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." > $CLIENTCLEAN/client9.txt || true
head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." > $CLIENTCLEAN/client18.txt || true
head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true
head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true
rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
strings $CLIENTCLEAN/client42.txt | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
strings $CLIENTCLEAN/client43.txt | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt
sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt
sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt
for C in $(ls -1 $CLIENTCLEAN); do
sort -o tmp $CLIENTCLEAN/$C || true
......
......@@ -11,6 +11,9 @@ log: "results/gateway-1.log"
# Used for debugging
verbose: "true"
# I am first node
firstNode: "true"
# The cMix nodes in the network
cMixNodes:
- "localhost:60000"
......
......@@ -11,6 +11,9 @@ log: "results/gateway-3.log"
# Used for debugging
verbose: "true"
# I am last node
lastNode: "true"
# The cMix nodes in the network
cMixNodes:
- "localhost:60000"
......
......@@ -21,10 +21,15 @@ do
$SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 &
PIDVAL=$!
echo "$SERVERCMD -- $PIDVAL"
if [ $SERVERID -eq 2 ]; then
sleep 15 # This will force a CDE timeout
fi
done
echo "STARTING GATEWAYS..."
sleep 5
# Start gateways
for GWID in $(seq 3 -1 1)
do
......@@ -35,10 +40,12 @@ do
echo "$GATEWAYCMD -- $PIDVAL"
done
sleep 120
jobs -p > results/serverpids
finish() {
echo "KILLED! STOPPING SERVERS AND GATEWAYS..."
echo "STOPPING SERVERS AND GATEWAYS..."
# NOTE: jobs -p doesn't work in a signal handler
for job in $(cat results/serverpids)
do
......@@ -52,13 +59,6 @@ trap finish INT
sleep 15
echo "STOPPING SERVERS AND GATEWAYS..."
# NOTE: jobs -p doesn't work in a signal handler
for job in $(cat results/serverpids)
do
echo "Stopping $job"
kill $job
done
echo "CHECKING OUTPUT FOR ERRORS"
set +x
......@@ -80,6 +80,5 @@ if [ ! -s rid.txt ]; then
exit 42
fi
echo "SUCCESS!"
tail $SERVERLOGS/*.console
echo "SUCCESS!"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment