From 9de45bd4c5d9c6ec16175213dda09f74ff363c72 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 16 Apr 2024 19:19:26 +0200 Subject: [PATCH] Make Duniter server load balancing --- tools/PAY4SURE.sh | 46 ++++++++++++++++++++------------------ tools/jaklis/.env.template | 8 ++----- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index e0934e73..7dc56d67 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -76,13 +76,14 @@ rm -f ${PENDINGDIR}/${MOATS}.result.html # MAKE PAYMENT echo ${MY_PATH}/jaklis/jaklis.py -k ${PENDINGDIR}/${MOATS}.key pay -a ${AMOUNT} -p ${G1PUB} -c "${COMMENT}" -m 2>&1> ${PENDINGDIR}/${MOATS}.result.html +ISOK=$? CHK1=$(cat ${PENDINGDIR}/${MOATS}.result.html | head -n 1 ) CHK2=$(cat ${PENDINGDIR}/${MOATS}.result.html | head -n 2 ) - +echo echo ${CHK1} echo ${CHK2} - -if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep 'conforme') ]]; then +echo +if [[ ${ISOK} == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep 'conforme') ]]; then echo "TRANSACTION SENT" echo "SENT" > ${PENDINGFILE} ## TODO : MONITOR POTENTIAL CHAIN REJECTION (FORK/MERGE WINDOW) @@ -124,29 +125,30 @@ if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep ' else echo "TRANSACTION ERROR" + GVASERVER=$(${MY_PATH}/duniter_getnode.sh | tail -n 1) - ## INFORM SYSTEM MUST RENEW OPERATION - rm ${PENDINGFILE} - echo "

BLOCKCHAIN CONNEXION ERROR

-

- MUST RETRY -

- LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result.html + #~ ## INFORM SYSTEM MUST RENEW OPERATION + #~ rm ${PENDINGFILE} + #~ echo "

BLOCKCHAIN CONNEXION ERROR

+ #~

- MUST RETRY -

+ #~ LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result.html - ## COUNT NUMBER OF TRY - try=$(cat ${PENDINGDIR}/${MOATS}.try 2>/dev/null) || try=0 + #~ ## COUNT NUMBER OF TRY + #~ try=$(cat ${PENDINGDIR}/${MOATS}.try 2>/dev/null) || try=0 - [ $try -gt 2 ] \ - && echo "${MOATS} TOO MANY TRY ( $try )" >> ${PENDINGDIR}/${MOATS}.result.html \ - && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT CANCELED" \ - && exit 1 \ - || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT REPLAY" + #~ [ $try -gt 2 ] \ + #~ && echo "${MOATS} TOO MANY TRY ( $try )" >> ${PENDINGDIR}/${MOATS}.result.html \ + #~ && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT CANCELED" \ + #~ && exit 1 \ + #~ || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result.html "PAYMENT REPLAY" - ( - ((try++)) && echo $try > ${PENDINGDIR}/${MOATS}.try - chmod +x ${PENDINGDIR}/${MOATS}_replay.sh - sleep 3600 - ${PENDINGDIR}/${MOATS}_replay.sh - exit 0 - ) & + #~ ( + #~ ((try++)) && echo $try > ${PENDINGDIR}/${MOATS}.try + #~ chmod +x ${PENDINGDIR}/${MOATS}_replay.sh + #~ sleep 3600 + #~ ${PENDINGDIR}/${MOATS}_replay.sh + #~ exit 0 + #~ ) & fi diff --git a/tools/jaklis/.env.template b/tools/jaklis/.env.template index 462b319e..2a53b4bc 100755 --- a/tools/jaklis/.env.template +++ b/tools/jaklis/.env.template @@ -1,10 +1,6 @@ # Chemin de la clé privé Ḡ1 de l'émetteur, au format PubSec -DUNIKEY= - +DUNIKEY=/.zen/game/players/.current/secret.dunikey # Noeud Duniter -NODE=https://g1.librelois.fr/gva - +NODE=https://g1.copylaradio.com/gva # Adresse du pod Cesium ou Gchange à utiliser POD=https://g1.data.le-sou.org -#POD=https://g1.data.duniter.fr -#POD=https://data.gchange.fr