Merge branch 'logLevel' into 'release'

Modify for log level changes

See merge request !69

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:

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:

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:

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:

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:

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"
 

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"

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:

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:

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:

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:

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:

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"

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:

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"

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"

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:

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:

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: