[taler-grid5k] 70/141: update wallet logs

[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 be60df6395e6e5f8dc4747aa3c910ca99eeade1e
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Oct 22 10:58:30 2021 +0200

    update wallet logs
---
 experiment/run.sh          | 40 ++++++++++++++++++++--------------------
 experiment/scripts/test.sh | 19 ++++++++-----------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/experiment/run.sh b/experiment/run.sh
index 83d8db0..d250f53 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -27,31 +27,11 @@ case "${HOSTNAME}" in
     set_ddn ${BANK_DOMAIN}
     exec ~/scripts/bank.sh
     ;;
-  ${WALLET_HOSTS}) 
-    echo "WALLET"
-    # sleep a random amount in 1 to 20 seconds
-    # so every wallet has enough time and no entry is duplicated
-    sleep $[ ( $RANDOM % 20 )  + 1 ]s
-    for (( i = 0; i < ${NUM_WALLET_HOSTS}; ++i )) 
-    do 
-      if ! nslookup "wallet-${i}.${DNS_ZONE}"; 
-      then
-        set_ddn "wallet-${i}.${DNS_ZONE}"
-       break
-      fi
-    done
-    exec ~/scripts/wallet.sh 
-    ;;
   ${DATABASE_HOSTS}) 
     echo "DATABASE"
     set_ddn ${DATABASE_DOMAIN}
     exec ~/scripts/database.sh 
     ;;
-  ${PROXY_HOSTS})
-    echo "PROXY"
-    set_ddn ${PROXY_DOMAIN}
-    exec ~/scripts/proxy.sh
-    ;;
   ${EXCHANGE_HOSTS}) 
     echo "EXCHANGE"
     set_ddn ${EXCHANGE_DOMAIN}
@@ -67,6 +47,26 @@ case "${HOSTNAME}" in
     set_ddn ${MONITOR_DOMAIN}
     exec ~/scripts/monitor.sh
     ;;
+  ${PROXY_HOSTS})
+    echo "PROXY"
+    set_ddn ${PROXY_DOMAIN}
+    exec ~/scripts/proxy.sh
+    ;;
+  ${WALLET_HOSTS}) 
+    echo "WALLET"
+    # sleep a random amount in 1 to 20 seconds
+    # so every wallet has enough time and no entry is duplicated
+    sleep $[ ( $RANDOM % 20 )  + 1 ]s
+    for (( i = 0; i < ${NUM_WALLET_HOSTS}; ++i )) 
+    do 
+      if ! nslookup "wallet-${i}.${DNS_ZONE}"; 
+      then
+        set_ddn "wallet-${i}.${DNS_ZONE}"
+       break
+      fi
+    done
+    exec ~/scripts/wallet.sh 
+    ;;
 esac
 
 exit 0
diff --git a/experiment/scripts/test.sh b/experiment/scripts/test.sh
index f53ff3d..9950965 100755
--- a/experiment/scripts/test.sh
+++ b/experiment/scripts/test.sh
@@ -8,8 +8,7 @@ function log() {
          --port 1515 \
          --server ${MONITOR_DOMAIN} \
          --tag taler-wallet \
-         --id ${FAKE_PID} \
-         "$(date -Ins) taler-wallet-cli-${FAKE_PID} ${2:-INFO} ${1}"
+         "ts=$(date -Ins) id=${FAKE_PID} host=${HOSTNAME} level=${2:-INFO} 
${1}"
 }
 
 for i in {0..10000};
@@ -23,10 +22,9 @@ do
         --bank "http://${BANK_DOMAIN}/"; \
         --amount KUDOS:1000;
   then
-    log "reserved KUDOS:1000" 
+    log "action=reserve status=succeeded amount=KUDOS:1000" 
   else
-    log "failed to reserve KUDOS" "ERROR"
-    continue
+    log "action=reserve status=failed" "ERROR"
   fi
 
   if taler-wallet-cli \
@@ -35,10 +33,9 @@ do
       run-until-done \
         --max-retries=10;
   then
-    log "retrieved all reserved KUDOS" 
+    log "action=withdraw status=succeeded" 
   else 
-    log "failed to retrieve KUDOS" "ERROR"
-    continue
+    log "action=withdraw status=failed" "ERROR"
   fi
 
   for i in {1..10};
@@ -46,12 +43,12 @@ do
     if taler-wallet-cli \
         --wallet-db="${DB_FILE}" \
         --no-throttle \
-       deposit create KUDOS:100 \
+       deposit create KUDOS:50 \
         "payto://x-taler-bank/${BANK_DOMAIN}/Exchange";
     then
-      log "deposited KUDOS:100 to bank" 
+      log "action=deposit status=succeeded amount=KUDOS:50" 
     else 
-      log "failed to deposit KUDOS:100" "ERROR"
+      log "action=deposit status=failed" "ERROR"
       continue
     fi
   done

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