Updated functions for better error handling and logging feedback
This commit is contained in:
@@ -23,6 +23,17 @@ log() {
|
||||
[ "$DEBUG_MODE" -eq 1 ] && printf "%s\n" "$log_line"
|
||||
}
|
||||
|
||||
# --- Exit function ---
|
||||
call_exit() {
|
||||
value="$1"
|
||||
if [ "$value" -eq 0 ]; then
|
||||
log "WARN" "pub_event exited normally"
|
||||
else
|
||||
log "INFO" "pub_event exited with warnings"
|
||||
fi
|
||||
exit "$value"
|
||||
}
|
||||
|
||||
eventfile="/tmp/es_state.inf"
|
||||
|
||||
# 1. Check if the file exists and is not empty
|
||||
@@ -34,31 +45,30 @@ fi
|
||||
# 2. Read the payload safely
|
||||
PAYLOAD=$(cat "$eventfile")
|
||||
|
||||
# 3. Wait for connection to rclone endpoint
|
||||
connect_success=0
|
||||
for i in $(seq 10); do
|
||||
if [ nc -z "$RCLONE_ENDPOINT" "$RCLONE_PORT" -eq 0 ] {
|
||||
connect_success=1
|
||||
break
|
||||
fi
|
||||
for i in $(seq 5); do
|
||||
log "INFO" "Waiting on rclone endpoint... $i"
|
||||
[ "$(nc -z "$RCLONE_ENDPOINT" "$RCLONE_PORT")" ] || connect_success=1
|
||||
[ "$connect_success" ] && break
|
||||
sleep 0.5
|
||||
done
|
||||
|
||||
# 3. Publish and log success/failure
|
||||
if [ mosquitto_pub -h 127.0.0.1 -p 1883 -t "$TOPIC" "$PAYLOAD" -eq 0 ]; then
|
||||
log "INFO" "Successfully published event."
|
||||
else
|
||||
[ "$connect_success" ] || ( log "ERROR" "Remote repository not accessable" && exit 1 )
|
||||
|
||||
# 4. Publish and log success/failure
|
||||
if [ "$(mosquitto_pub -h 127.0.0.1 -p 1883 -t "$TOPIC" "$PAYLOAD")" ]; then
|
||||
log "ERROR" "Failed to connect to mosquitto broker."
|
||||
exit 1
|
||||
else
|
||||
log "INFO" "Successfully published event."
|
||||
fi
|
||||
|
||||
# 4. Wait for response from daemon
|
||||
# 5. Wait for response from daemon
|
||||
mosquitto_sub -h 127.0.0.1 -p 1883 -t "$TOPIC" | while IFS="=" read -r key value
|
||||
do
|
||||
case "$key" in
|
||||
"SaveSync") break;;
|
||||
"SaveSync") call_exit "$value";;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$value" -eq 0 ]; then
|
||||
log "WARN" "pub_event exited normally"
|
||||
else
|
||||
log "INFO" "pub_event exited with warnings"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user