summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoss Marco <bossm8@bfh.ch>2022-05-10 11:45:14 +0200
committerBoss Marco <bossm8@bfh.ch>2022-05-10 11:45:14 +0200
commit4e424eb79a1c682034aa9f41a138dd081b71f98c (patch)
treeb8a3517558293413dcf0138a8f677854d438a7d6
parent2cac1836f82d4e7588e7b004dbb56089a332cf4e (diff)
downloadgrid5k-4e424eb79a1c682034aa9f41a138dd081b71f98c.tar.gz
grid5k-4e424eb79a1c682034aa9f41a138dd081b71f98c.tar.bz2
grid5k-4e424eb79a1c682034aa9f41a138dd081b71f98c.zip
drop loglines from fakebank when done
-rw-r--r--configs/etc/monitor/promtail.yaml2
-rw-r--r--experiment/env2
-rwxr-xr-xexperiment/scripts/bank.sh4
-rwxr-xr-xexperiment/scripts/benchmark.sh2
4 files changed, 9 insertions, 1 deletions
diff --git a/configs/etc/monitor/promtail.yaml b/configs/etc/monitor/promtail.yaml
index 484f133..ac817ef 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -177,3 +177,5 @@ scrape_configs:
source: account
config:
action: inc
+ - drop:
+ expression: '.*Making.*'
diff --git a/experiment/env b/experiment/env
index f88687e..4f0cee8 100644
--- a/experiment/env
+++ b/experiment/env
@@ -107,6 +107,8 @@ TALER_WALLET_BATCH_WITHDRAWAL=1
# How the wallets select merchants, possible values: 'zipf' and 'rand'
# If the configured value is neither zipf or rand, a single merchant is taken
WALLET_MERCHANT_SELECTION=normal
+# How many merchants should be used to select randomly from
+WALLET_NUM_MERCHANTS=1000
# Needed for wallets to accept self signed certificates
NODE_TLS_REJECT_UNAUTHORIZED=0
diff --git a/experiment/scripts/bank.sh b/experiment/scripts/bank.sh
index 6184bd4..61d04c8 100755
--- a/experiment/scripts/bank.sh
+++ b/experiment/scripts/bank.sh
@@ -13,6 +13,10 @@ source ~/scripts/helpers.sh
# Start the taler-fakebank
function init_bank() {
+ # Force the "Make tranfer from X to Y" to be logged for statistics
+ # of payment distribution
+ echo "GNUNET_FORCE_LOG=\";;make_transfer;;INFO\"" \
+ | tee -a /etc/environment ~/.env
create_cert "${NODE_NAME}.${DNS_ZONE}" "/etc/ssl/bank"
setup_rsyslog_for_nginx
restart_rsyslog
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 6f87747..1f97391 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -43,7 +43,7 @@ function start_wallet_bench() {
\"currency\": \"KUDOS\",
\"paytoTemplate\": \"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-\${id}\",
\"randomAlg\": \"${WALLET_MERCHANT_SELECTION}\",
- \"numMerchants\": 10,
+ \"numMerchants\": ${WALLET_NUM_MERCHANTS},
\"iterations\": 100000,
\"deposits\": ${NUM_DEPOSITS},
\"restartAfter\": 2