work around libeufin-cli bug

This commit is contained in:
Florian Dold 2022-11-04 14:23:15 +01:00
parent e4ba8151d0
commit 81ee8f01d8
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 10 additions and 6 deletions

View File

@ -142,13 +142,15 @@ echo "Launching services (pre audit DB: $TARGET_DB)"
export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3" export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3"
# Create the default demobank. # Create the default demobank.
cd $MY_TMP_DIR cd $MY_TMP_DIR
export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
libeufin-sandbox config --currency "TESTKUDOS" default libeufin-sandbox config --currency "TESTKUDOS" default
libeufin-sandbox serve --no-auth --port "1${BANK_PORT}" \ libeufin-sandbox serve --port "1${BANK_PORT}" \
> ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \ > ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \
2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log & 2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log &
echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid
cd $ORIGIN cd $ORIGIN
export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/" export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default"
echo $LIBEUFIN_SANDBOX_URL
set +e set +e
echo -n "Waiting for Sandbox..." echo -n "Waiting for Sandbox..."
OK=0 OK=0
@ -156,9 +158,10 @@ for n in `seq 1 50`; do
echo -n "." echo -n "."
sleep 1 sleep 1
if wget --timeout=1 \ if wget --timeout=1 \
--user admin --password secret \
--tries=3 --waitretry=0 \ --tries=3 --waitretry=0 \
-o /dev/null -O /dev/null \ -o /dev/null -O /dev/null \
${LIBEUFIN_SANDBOX_URL}demobanks; ${LIBEUFIN_SANDBOX_URL};
then then
OK=1 OK=1
break break

View File

@ -145,14 +145,14 @@ echo "Launching services"
export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3" export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3"
# Create the default demobank. # Create the default demobank.
cd $MY_TMP_DIR cd $MY_TMP_DIR
libeufin-sandbox config --currency "TESTKUDOS" default
export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
libeufin-sandbox config --currency "TESTKUDOS" default
libeufin-sandbox serve --port "1${BANK_PORT}" \ libeufin-sandbox serve --port "1${BANK_PORT}" \
> ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \ > ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \
2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log & 2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log &
echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid
cd $ORIGIN cd $ORIGIN
export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/" export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default"
set +e set +e
echo -n "Waiting for Sandbox..." echo -n "Waiting for Sandbox..."
OK=0 OK=0
@ -160,9 +160,10 @@ for n in `seq 1 50`; do
echo -n "." echo -n "."
sleep 1 sleep 1
if wget --timeout=1 \ if wget --timeout=1 \
--user admin --password secret \
--tries=3 --waitretry=0 \ --tries=3 --waitretry=0 \
-o /dev/null -O /dev/null \ -o /dev/null -O /dev/null \
${LIBEUFIN_SANDBOX_URL}demobanks; ${LIBEUFIN_SANDBOX_URL};
then then
OK=1 OK=1
break break