roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aggiunto unlock in caso timeout della funzione lock

Browse Source
This commit is contained in:
lejubila
2017-06-10 23:51:28 +02:00
parent 5a28d129f5
commit e288244803
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
piGarden.sh
View File

@@ -23,7 +23,7 @@ function initialize {
fi fi
# Elimina tutti gli stati delle elettrovalvole preesistenti # Elimina tutti gli stati delle elettrovalvole preesistenti
rm -f "$STATUS_DIR"/* rm -f "$STATUS_DIR"/ev*
# Inizializza i gpio delle elettrovalvole e ne chiude l'alimentazione # Inizializza i gpio delle elettrovalvole e ne chiude l'alimentazione
for i in $(seq $EV_TOTAL) for i in $(seq $EV_TOTAL)
@@ -1430,6 +1430,8 @@ function lock {
if [ "$lock_content" -eq "1" ]; then if [ "$lock_content" -eq "1" ]; then
if [ "$current_time" -gt "$max_time" ]; then if [ "$current_time" -gt "$max_time" ]; then
log_write "Maximum locked time reached" log_write "Maximum locked time reached"
sleep $max_time
unlock
exit 1 exit 1
fi fi
log_write "Sleep 1 second for locked state" log_write "Sleep 1 second for locked state"
@@ -1441,6 +1443,18 @@ function lock {
} }
#
# Chidue un lock
#
function unlock {
echo "0" > "$LOCK_FILE"
}
#
# Invia l'identificativo univoco ad uso statistico di utilizzo
#
function send_identifier { function send_identifier {
if [ "$NO_SEND_IDENTIFIER" == "1" ]; then if [ "$NO_SEND_IDENTIFIER" == "1" ]; then
@@ -1465,16 +1479,7 @@ function send_identifier {
echo "$ID" > "$FILE_ID" echo "$ID" > "$FILE_ID"
fi fi
#$CURL https://www.lejubila.net/statistic/usage/piGarden/$ID/$VERSION/$SUB_VERSION/$RELEASE_VERSION > /dev/null $CURL https://www.lejubila.net/statistic/collect_usage/piGarden/$ID/$VERSION/$SUB_VERSION/$RELEASE_VERSION > /dev/null
}
#
# Chidue un lock
#
function unlock {
echo "0" > "$LOCK_FILE"
} }