Compare commits
5 commits
c29f1dc07e
...
8df59231a5
Author | SHA1 | Date | |
---|---|---|---|
|
8df59231a5 | ||
|
ee4dc72a0a | ||
|
0f0a743123 | ||
|
3bd1b4cf48 | ||
|
253992520b |
4 changed files with 8 additions and 9 deletions
|
@ -45,8 +45,8 @@ json="{\"transaction_uuid\":\"$uuid\",\"controller_id\":\"$name\",\"timestamp\":
|
||||||
touch $install_dir/lock
|
touch $install_dir/lock
|
||||||
file=$(date +%Y%m%d%H%M%S)-$(uuidgen)
|
file=$(date +%Y%m%d%H%M%S)-$(uuidgen)
|
||||||
for ((i=1 ; i <=3 ; i++));do
|
for ((i=1 ; i <=3 ; i++));do
|
||||||
if echo $json | jsonlint-php 2> /dev/null;then
|
if echo $json | $json_linter >/dev/null 2>&1 ;then
|
||||||
echo $json > /opt/nodemecu/stack/$file && rm /opt/nodemecu/lock && echo $((counter+1)) > $install_dir/counter && break
|
echo $json > $install_dir/stack/$file && rm $install_dir/lock && echo $((counter+1)) > $install_dir/counter && break
|
||||||
else
|
else
|
||||||
echo "$(date +%Y-%m-%d-%H:%M:%S) - No se pudo obtener información." >> $install_dir/errors.log && sleep 1
|
echo "$(date +%Y-%m-%d-%H:%M:%S) - No se pudo obtener información." >> $install_dir/errors.log && sleep 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
get_stack () {
|
get_stack () {
|
||||||
if [[ ! -z $1 && $1 == "wc" ]];then
|
if [[ ! -z $1 && $1 == "wc" ]];then
|
||||||
ls /opt/nodemecu/stack | wc -l
|
ls $install_dir/stack | wc -l
|
||||||
else
|
else
|
||||||
ls /opt/nodemecu/stack | tail -1
|
ls $install_dir/stack | tail -1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ url=https://ectomobile.sutty.nl/transactions
|
||||||
name=
|
name=
|
||||||
interval=
|
interval=
|
||||||
mode=test
|
mode=test
|
||||||
|
json_linter=jsonlint-php
|
||||||
|
|
||||||
|
|
||||||
# AJUSTES GENERALES
|
# AJUSTES GENERALES
|
||||||
|
|
|
@ -3,12 +3,13 @@
|
||||||
source /etc/nodemecu.conf
|
source /etc/nodemecu.conf
|
||||||
source $install_dir/functions
|
source $install_dir/functions
|
||||||
|
|
||||||
|
# No expandir directorios vacíos
|
||||||
|
shopt -s nullglob
|
||||||
|
|
||||||
# Revisando stack
|
# Revisando stack
|
||||||
|
|
||||||
for filename in $install_dir/stack/*;do
|
for filename in $install_dir/stack/*;do
|
||||||
test "$filename" = "$install_dir/stack/\*" || break
|
$json_linter $filename >/dev/null 2>&1 || mv -v $filename $corrupt
|
||||||
jq $filename >/dev/null 2>&1 || mv -v $filename $corrupt
|
|
||||||
done
|
done
|
||||||
|
|
||||||
while :;do
|
while :;do
|
||||||
|
@ -41,7 +42,4 @@ while :;do
|
||||||
echo $err_time - $local_transaction_uuid - server status: $server_error $srv_msg $curl_msg >> $log
|
echo $err_time - $local_transaction_uuid - server status: $server_error $srv_msg $curl_msg >> $log
|
||||||
rm $curl_err
|
rm $curl_err
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
exit
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue