From c4ec089d44a16fced877f368c641049388f1f368 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 16 Oct 2019 17:35:09 +0200 Subject: [PATCH] Rebuild container, update makefile --- .dockerignore | 4 ++++ scripts/Makefile | 8 ++++++++ scripts/lightning-server | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index dca1d1b..0f1e5dd 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,5 @@ scripts/out* +res/* +out/* +log/* +r/* diff --git a/scripts/Makefile b/scripts/Makefile index fa00f04..5806767 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -703,3 +703,11 @@ thunder_guards: tor2 -f /etc/torrc_guard_8, \ tor2 -f /etc/torrc_guard_10, \ tor2 -f /etc/torrc_guard_12 + +lightning-base: + ./run-3 \ + 1,lightning_base. \ + lightning-client 3000 40 172 8 tick_tock=1. \ + lightning-server 3000 40 172 8 tick_tock=1. \ + tor2 -f /etc/torrc_simple. \ + tor2 -f /etc/torrc_simple diff --git a/scripts/lightning-server b/scripts/lightning-server index 7e815af..705c334 100755 --- a/scripts/lightning-server +++ b/scripts/lightning-server @@ -5,10 +5,10 @@ cd $6/shared donar \ -a lightning \ -s \ - -l $1 \ - -p $2 \ + -l $4 \ + -p $5 \ -b \ -e 9000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -h 127.0.0.1 -p 9000 -l -c $3 -i $4 -s $5 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log +measlat -h 127.0.0.1 -p 9000 -l -c $1 -i $2 -s $3 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log