From f1844ed9a55de4b5e5930f03bb61bb0a566fcd60 Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Thu, 9 Apr 2020 12:44:04 -0700
Subject: [PATCH] Modify for log level changes

---
 basice2e/gateway-1.yaml     | 4 ++--
 basice2e/gateway-2.yaml     | 5 +++--
 basice2e/gateway-3.yaml     | 5 +++--
 basice2e/gateway-4.yaml     | 4 ++--
 basice2e/gateway-5.yaml     | 4 ++--
 basice2e/permissioning.yaml | 5 +++--
 basice2e/run.sh             | 6 +++---
 basice2e/server-1.yaml      | 5 +++--
 basice2e/server-2.yaml      | 6 ++++--
 basice2e/server-3.yaml      | 5 +++--
 basice2e/server-4.yaml      | 5 +++--
 basice2e/server-5.yaml      | 5 +++--
 smokeinfra/gateway-1.yaml   | 4 ++--
 smokeinfra/gateway-2.yaml   | 4 ++--
 smokeinfra/gateway-3.yaml   | 4 ++--
 smokeinfra/run.sh           | 4 ++--
 smokeinfra/server-1.yaml    | 4 ++--
 smokeinfra/server-2.yaml    | 4 ++--
 smokeinfra/server-3.yaml    | 4 ++--
 19 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 613d31b..c3bcd77 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 b5958f3..9a25bc9 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 0e2975a..8bead2e 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 8b7b3a0..1571f05 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 364339c..e7f1926 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 71860c3..c29d3af 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 85a1f08..e8f66b9 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 653b133..7db578f 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 ab7f577..3f28f6f 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 a7de0eb..ac600aa 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 8a54e93..614d62d 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 3b56710..b687fe3 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 b1bc8e0..564d296 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 1e714d5..c99e57a 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 c45cf03..3cffa7b 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 3b6bf6c..6809500 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 801cc93..56a1703 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 e8c581f..be1833d 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 214db87..3cbc84e 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:
-- 
GitLab