axiom-team
/
g1-stats
7
1
Fork 1
Code Issues Pull Requests Releases Activity

continue ...

This commit is contained in:
poka 2020-06-26 02:14:26 +02:00
parent 907c538e5a
commit dee743556f
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.env
renameHistory.sh
tmp*
db/*

5
g1-stats.sh
View File

@ -37,7 +37,7 @@ loopWalletUp() {
[[ -z ${TXBLOCKS[$i]} ]] && break
sleep 0.1
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
until WALLETS=$(echo $WALLETS0 | jq '.time,(.transactions[] | select(.issuers[0] as $issuers | .outputs[0]|contains($issuers)|not) | .outputs[0]')) 2>/dev/null; do
until WALLETS=$(echo $WALLETS0 | jq '.time,(.transactions[] | select(.issuers[0] as $issuers | .outputs[0]|contains($issuers)|not) | .outputs[0])' 2>/dev/null); do
[[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0"
sleep 2
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
@ -281,3 +281,6 @@ echo -e "$sleepyG1% des Ḡ1 n'ont jamais été utilisés."
rm $outFile
day=$(date +'%d-%m-%y')
echo "$day - Heure de fin: $(date +'%H:%M')"
echo "Début de la journalisation ..."
$SCRIPTPATH/soldeByDays.sh

35
soldeByDays.sh
View File

@ -7,7 +7,6 @@ echo -e "\n############# $day à $startTime #############\n"
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
if [[ -e $SCRIPTPATH/.env ]]; then source $SCRIPTPATH/.env; else echo "Veuillez créer votre fichier .env inspiré de .env.example" && exit 1; fi
lsDaysW=$(ls $SCRIPTPATH/tmp/*_wallets) # | awk -F/ '{ print $NF }') # | awk -F_ '{ print $1 }')
nbrW=$(cat $lsDaysW | wc -l)
lsDaysW=$(echo "$lsDaysW" | awk -F/ '{ print $NF }')
@ -17,15 +16,20 @@ nbrM=$(cat $lsDaysM | wc -l)
lsDaysM=$(echo "$lsDaysM" | awk -F/ '{ print $NF }')
rm $SCRIPTPATH/tmp/*_solde 2>/dev/null
! [[ -d $SCRIPTPATH/db ]] && mkdir $SCRIPTPATH/db
echo "[" > $SCRIPTPATH/db/recus.json
daysLoop() {
k=0
l=0
for i in $lsDays; do
# [[ $k -le 50 ]] && ((k++)) && continue
[[ $l -ge 20 ]] && break ## ((k++)) && continue
((l++))
walletDay=$(cat $SCRIPTPATH/tmp/$i)
[[ -z $walletDay ]] && continue
dateLDay=$(echo $i | awk -F_ '{ print $1 }')
dateLDay=$(date -d "$dateLDay" +%s -u)
dateT=$(echo $i | awk -F_ '{ print $1 }')
dateLDay=$(date -d "$dateT" +%s -u)
dateLDay=$(($dateLDay-3600*2))
dateHDay=$(($dateLDay+60*60*24))
dateHDay=$(($dateHDay+3600*2))
@ -43,6 +47,25 @@ for i in $lsDays; do
# Somme de la journée
soldes=$(cat $SCRIPTPATH/tmp/${i}_solde | awk '{total+=$1}END{print total}')
echo $soldes > $SCRIPTPATH/tmp/${i}_solde
# Écriture en JSON
soldes=$(echo "scale=2; $soldes/100" | bc)
if [[ $lsDays == $lsDaysW ]]; then
local jsonTPL=$(sed s/_DATE/$dateT/g $SCRIPTPATH/tpl/recus.json)
local jsonTPL=$(sed s/_RWALLETS/$soldes/g <<< $jsonTPL)
local jsonTPL=$(sed s/_RMEMBRES/_RMEMBRES_$dateT/g <<< $jsonTPL)
echo -e "$jsonTPL" | tr -d '\\' >> $SCRIPTPATH/db/recus.json
elif [[ $lsDays == $lsDaysM ]]; then
if [[ ! $(grep $dateT $SCRIPTPATH/db/recus.json) ]]; then
local jsonTPL=$(sed s/_DATE/$dateT/g $SCRIPTPATH/tpl/recus.json)
local jsonTPL=$(sed s/_RWALLETS/0/g <<< $jsonTPL)
local jsonTPL=$(sed s/_RMEMBRES/$soldes/g <<< $jsonTPL)
echo -e "$jsonTPL" | tr -d '\\' >> $SCRIPTPATH/db/recus.json
else
sed -i s/_RMEMBRES_$dateT/$soldes/g $SCRIPTPATH/db/recus.json
fi
fi
done
}
@ -54,6 +77,10 @@ lsDays=$lsDaysM
nbr=$nbrM
daysLoop
sed -i '$ s/,//g' $SCRIPTPATH/db/recus.json
echo "]" >> $SCRIPTPATH/db/recus.json
day=$(date +'%d-%m-%y')
echo "$day - Heure de fin: $(date +'%H:%M')"
$SCRIPTPATH/sum.sh