diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml index 613d31b05c96665b24bf9ee50601edc5c66ea4b5..c3bcd776cb3c81fbd8123f7b5be622ec9f9bbcb0 100644 --- a/basice2e/gateway-1.yaml +++ b/basice2e/gateway-1.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateways/gatway-1.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # The cMix nodes in the network cMixNodes: diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml index b5958f3defed06bc74c77de868806c13763bda42..9a25bc9ca9c2ae9bf3c548beba40e7615fbff749 100644 --- a/basice2e/gateway-2.yaml +++ b/basice2e/gateway-2.yaml @@ -8,8 +8,9 @@ # Output log file log: "results/gateways/gatway-2.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 + # The cMix nodes in the network cMixNodes: diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml index 0e2975a9c67834a3c58e47d8aa8f5add2a65b993..8bead2eeb51ddb88264f6e054a92b0ffbdd8024a 100644 --- a/basice2e/gateway-3.yaml +++ b/basice2e/gateway-3.yaml @@ -8,8 +8,9 @@ # Output log file log: "results/gateways/gatway-3.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 + # The cMix nodes in the network cMixNodes: diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml index 8b7b3a0eb86276f766f9d564819808ed74d251fa..1571f054ddd5ad83985ea687b399d12b22c91aaa 100644 --- a/basice2e/gateway-4.yaml +++ b/basice2e/gateway-4.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateways/gatway-4.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # The cMix nodes in the network cMixNodes: diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml index 364339c0319661013d65827ee8a6e533d77dd6b7..e7f1926ce0799319716d27496245f79e4c2d6ced 100644 --- a/basice2e/gateway-5.yaml +++ b/basice2e/gateway-5.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateways/gatway-5.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # The cMix nodes in the network cMixNodes: diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml index 71860c306ae19c40cd7f1bd63365a311ed70c8c1..c29d3af4c4919488e6950a20f4ea970790069c78 100644 --- a/basice2e/permissioning.yaml +++ b/basice2e/permissioning.yaml @@ -2,8 +2,9 @@ # Permissioning Server Configuration # ================================== -# Verbose logging -verbose: "true" +# Log message level +logLevel: 1 + # Path to log file logPath: "results/permissioning.log" diff --git a/basice2e/run.sh b/basice2e/run.sh index 85a1f08322e7ea9b4829e7d7d5b8304ce4430f91..e8f66b9a49d3ab9916ddff4072b663ec9771520f 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -25,7 +25,7 @@ mkdir -p $CLIENTCLEAN # Start a user discovery bot server echo "STARTING UDB..." -UDBCMD="../bin/udb -v --config udb.yaml " +UDBCMD="../bin/udb -v --config udb.yaml -l 1" $UDBCMD >> $UDBOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids @@ -41,7 +41,7 @@ echo "$PERMCMD -- $PIDVAL" for SERVERID in $(seq 5 -1 1) do IDX=$(($SERVERID - 1)) - SERVERCMD="../bin/server -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml" + SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml" $SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 & PIDVAL=$! echo "$SERVERCMD -- $PIDVAL" @@ -51,7 +51,7 @@ done for GWID in $(seq 5 -1 1) do IDX=$(($GWID - 1)) - GATEWAYCMD="../bin/gateway -v -i $IDX --config gateway-$GWID.yaml" + GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml" $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID-console.txt 2>&1 & PIDVAL=$! echo "$GATEWAYCMD -- $PIDVAL" diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml index 653b133f567f0c600cc9fd150a4ece0cbed45390..7db578f56939724975b604cb28609079bdeef8ea 100644 --- a/basice2e/server-1.yaml +++ b/basice2e/server-1.yaml @@ -7,8 +7,9 @@ # batch size batch: 4 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 + node: id: "" paths: diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml index ab7f577100b864669d873e86e3ed080744f39574..3f28f6f26d389c58316d4c0d32d17081fe53b0b8 100644 --- a/basice2e/server-2.yaml +++ b/basice2e/server-2.yaml @@ -7,8 +7,10 @@ # batch size batch: 4 skipReg: true -# debug logging -verbose: true + +# Log message level +logLevel: 1 + node: id: "" paths: diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml index a7de0eb74dcdbd5d87fc6ca752b0db3d527579e9..ac600aaffaa8993a5ac50bb705ccb6000216d0ca 100644 --- a/basice2e/server-3.yaml +++ b/basice2e/server-3.yaml @@ -7,8 +7,9 @@ # batch size batch: 4 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 + node: id: "" paths: diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml index 8a54e9398e1aa3da852646585e1f41bb7f0aab2a..614d62d395b1b32251701d78bd8dbff6c4cd70a2 100644 --- a/basice2e/server-4.yaml +++ b/basice2e/server-4.yaml @@ -7,8 +7,9 @@ # batch size batch: 4 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 + node: id: "" paths: diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml index 3b5671057126dcf462b9bd1a44806a93b580811d..b687fe31cf730b58cf118521dcb2fd38a7351593 100644 --- a/basice2e/server-5.yaml +++ b/basice2e/server-5.yaml @@ -7,8 +7,9 @@ # batch size batch: 4 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 + node: id: "" paths: diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml index b1bc8e077eb0ad20bf3bb49331764b1babe63819..564d2961444cd40c50bdadc954037cadbedf498b 100644 --- a/smokeinfra/gateway-1.yaml +++ b/smokeinfra/gateway-1.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateway-1.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # I am first node firstNode: "true" diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml index 1e714d5e506ad7de17ec2d205dadd4dcb93e0472..c99e57a9c8b5adc9fe14bc5725b35e124039ca47 100644 --- a/smokeinfra/gateway-2.yaml +++ b/smokeinfra/gateway-2.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateway-2.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # The cMix nodes in the network cMixNodes: diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml index c45cf03236d33f0c076ae429c23e1f811a58f4c5..3cffa7bc5fe6fdfa4482621bf5d715ab3758e036 100644 --- a/smokeinfra/gateway-3.yaml +++ b/smokeinfra/gateway-3.yaml @@ -8,8 +8,8 @@ # Output log file log: "results/gateway-3.log" -# Used for debugging -verbose: "true" +# Log message level +logLevel: 1 # I am last node lastNode: "true" diff --git a/smokeinfra/run.sh b/smokeinfra/run.sh index 3b6bf6c0fddcb3d9afdf57b5181bb52ce7d94df4..680950005681d9ef1ad4d0db1a1ad7cea94d601a 100755 --- a/smokeinfra/run.sh +++ b/smokeinfra/run.sh @@ -17,7 +17,7 @@ echo "STARTING SERVERS..." for SERVERID in $(seq 3 -1 1) do IDX=$(($SERVERID - 1)) - SERVERCMD="../bin/server -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --noTLS --disablePermissioning" + SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --noTLS --disablePermissioning" $SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 & PIDVAL=$! echo "$SERVERCMD -- $PIDVAL" @@ -34,7 +34,7 @@ sleep 5 for GWID in $(seq 3 -1 1) do IDX=$(($GWID - 1)) - GATEWAYCMD="../bin/gateway -v -i $IDX --config gateway-$GWID.yaml --noTLS --disablePermissioning" + GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml --noTLS --disablePermissioning" $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID.console 2>&1 & PIDVAL=$! echo "$GATEWAYCMD -- $PIDVAL" diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml index 801cc9384685c264a5c285391136a252cb14e917..56a17037995a0b836e4f751741a874de2a9d4226 100644 --- a/smokeinfra/server-1.yaml +++ b/smokeinfra/server-1.yaml @@ -7,8 +7,8 @@ # batch size batch: 42 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 node: id: "" paths: diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml index e8c581f3b334d6023e8635bb5a64792c48565167..be1833ddb7820f5ffdffdbc5d44d8c7800034859 100644 --- a/smokeinfra/server-2.yaml +++ b/smokeinfra/server-2.yaml @@ -7,8 +7,8 @@ # batch size batch: 42 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 node: id: "" paths: diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml index 214db87619a5d4d2e4635278d2084686b5cccccc..3cbc84e162e3dfb7cafe41a8ee171e8e529987c7 100644 --- a/smokeinfra/server-3.yaml +++ b/smokeinfra/server-3.yaml @@ -7,8 +7,8 @@ # batch size batch: 42 skipReg: true -# debug logging -verbose: true +# Log message level +logLevel: 1 node: id: "" paths: