[taler-grid5k] 150/189: various imrovements / fixes

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit e602a261cb4a667477ca84e65e1de1b7f8c19d38
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Apr 14 15:54:22 2022 +0200

    various imrovements / fixes
---
 additional/persist.sh                      | 2 +-
 configs/etc/nginx/sites-available/fakebank | 2 +-
 experiment/env                             | 2 ++
 experiment/scripts/benchmark.sh            | 7 ++++++-
 experiment/scripts/exchange-aggregator.sh  | 1 +
 experiment/scripts/exchange-closer.sh      | 1 +
 experiment/scripts/exchange-transfer.sh    | 1 +
 experiment/scripts/exchange-wirewatch.sh   | 2 ++
 8 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/additional/persist.sh b/additional/persist.sh
index f1284fd..f31a7c1 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -22,7 +22,7 @@ fi
 if [ -z ${2} ]; then
   echo "No plots will be included"
 else
-  echo "The file '${2}' will be deleted when this script finishes, do you want 
to contiue?" 
+  echo "The file '${2}' will be deleted when this script finishes, do you want 
to contiue? [y/n]" 
   while true; do
     read -n 1 -s yn
     case $yn in
diff --git a/configs/etc/nginx/sites-available/fakebank 
b/configs/etc/nginx/sites-available/fakebank
index 1c32413..6545770 100644
--- a/configs/etc/nginx/sites-available/fakebank
+++ b/configs/etc/nginx/sites-available/fakebank
@@ -20,7 +20,7 @@ server {
   access_log 
syslog:server=localhost,facility=user,tag=taler_fakebank_proxy,severity=info 
taler;
 
   location / {
-     proxy_pass http://localhost:8082
+     proxy_pass http://localhost:8082;
      proxy_redirect off;
      proxy_set_header Host $host;
      proxy_set_header X-Forwarded-Host $remote_addr;
diff --git a/experiment/env b/experiment/env
index c505728..eeed21f 100644
--- a/experiment/env
+++ b/experiment/env
@@ -97,6 +97,8 @@ NUM_WALLET_PROCESSES=10
 WALLET_BENCHMARK=bench1
 # Request the exchange via https instead of http
 WALLET_USE_HTTPS=true
+# Run a withdraw only experiment
+WALLET_WITHDRAW_ONLY=false
 # Needed for wallets to accept self signed certificates
 NODE_TLS_REJECT_UNAUTHORIZED=0
 
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index f095b9d..72cd87c 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -24,6 +24,11 @@ function start_wallet_bench() {
   if ! (($1 % 100)) || [ $1 == "1" ]; then
     LOG_LEVEL=INFO
   fi
+
+  NUM_DEPOSITS=$((RANDOM %21))
+  if [[ ${WALLET_WITHDRAW_ONLY} == "true" ]]; then
+    NUM_DEPOSITS=0
+  fi
   
   taler-wallet-cli \
       -L ${LOG_LEVEL} \
@@ -35,7 +40,7 @@ function start_wallet_bench() {
     \"currency\": \"KUDOS\",
     \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/foo\",
     \"iterations\": 100000,
-    \"deposits\": 0,
+    \"deposits\": ${NUM_DEPOSITS},
     \"restartAfter\": 2
   }"
 }
diff --git a/experiment/scripts/exchange-aggregator.sh 
b/experiment/scripts/exchange-aggregator.sh
index 3656984..c8a7a77 100755
--- a/experiment/scripts/exchange-aggregator.sh
+++ b/experiment/scripts/exchange-aggregator.sh
@@ -20,6 +20,7 @@ source ~/scripts/helpers.sh
 # $1: N - number of new aggregators to start
 # NOTE: only for init purposes currently
 function start_aggregators() {
+  restart_rsyslog
   for i in $( seq $(echo "2^${1}" | bc) ); do
     systemctl restart taler-exchange-aggregator@"${i}".service
   done
diff --git a/experiment/scripts/exchange-closer.sh 
b/experiment/scripts/exchange-closer.sh
index c14f392..e91abda 100755
--- a/experiment/scripts/exchange-closer.sh
+++ b/experiment/scripts/exchange-closer.sh
@@ -20,6 +20,7 @@ source ~/scripts/helpers.sh
 # $1: N - number of new aggregators to start
 # NOTE: only for init purposes currently
 function start_closers() {
+  restart_rsyslog
   for i in $(seq ${1}); do
     systemctl restart taler-exchange-closer@"${i}".service
   done
diff --git a/experiment/scripts/exchange-transfer.sh 
b/experiment/scripts/exchange-transfer.sh
index e5e22f6..cb1700e 100755
--- a/experiment/scripts/exchange-transfer.sh
+++ b/experiment/scripts/exchange-transfer.sh
@@ -20,6 +20,7 @@ source ~/scripts/helpers.sh
 # $1: N - number of new aggregators to start
 # NOTE: only for init purposes currently
 function start_transfers() {
+  restart_rsyslog
   for i in $(seq ${1}); do
     systemctl restart taler-exchange-transfer@"${i}".service
   done
diff --git a/experiment/scripts/exchange-wirewatch.sh 
b/experiment/scripts/exchange-wirewatch.sh
index 34deb8a..3341a35 100755
--- a/experiment/scripts/exchange-wirewatch.sh
+++ b/experiment/scripts/exchange-wirewatch.sh
@@ -36,9 +36,11 @@ function stop_wirewatches() {
 case $1 in
   init)
     setup_exchange_config_master_key_from_api
+    restart_rsyslog
     start_wirewatches "$NUM_WIREWATCH_PROCESSES"
     ;;
   init-start)
+    restart_rsyslog
     start_wirewatches "$NUM_WIREWATCH_PROCESSES"
     ;;
   start)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.