Revert "restart services if analysis hangs"

This reverts commit 5cd885b24c.
This commit is contained in:
ehpersonal38
2023-02-16 21:56:42 -05:00
parent 394f0d73b5
commit a439214d32
+9 -24
View File
@@ -40,10 +40,10 @@ if [ ! -f ${EXCLUDE_LIST} ];then
chmod g+rw ${EXCLUDE_LIST} chmod g+rw ${EXCLUDE_LIST}
fi fi
if [ "$(du ${INCLUDE_LIST} | awk '{print $1}')" -lt 4 ];then if [ "$(du ${INCLUDE_LIST} | awk '{print $1}')" -lt 4 ];then
INCLUDE_LIST=null INCLUDE_LIST=null
fi fi
if [ "$(du ${EXCLUDE_LIST} | awk '{print $1}')" -lt 4 ];then if [ "$(du ${EXCLUDE_LIST} | awk '{print $1}')" -lt 4 ];then
EXCLUDE_LIST=null EXCLUDE_LIST=null
fi fi
# Create an array of the audio files # Create an array of the audio files
@@ -140,7 +140,7 @@ run_analysis() {
${INCLUDEPARAM} \ ${INCLUDEPARAM} \
${EXCLUDEPARAM} \ ${EXCLUDEPARAM} \
${BIRDWEATHER_ID_LOG} ${BIRDWEATHER_ID_LOG}
output=$($PYTHON_VIRTUAL_ENV $DIR/analyze.py \ $PYTHON_VIRTUAL_ENV $DIR/analyze.py \
--i "${1}/${i}" \ --i "${1}/${i}" \
--o "${1}/${i}.csv" \ --o "${1}/${i}.csv" \
--lat "${LATITUDE}" \ --lat "${LATITUDE}" \
@@ -151,19 +151,11 @@ ${BIRDWEATHER_ID_LOG}
--min_conf "${CONFIDENCE}" \ --min_conf "${CONFIDENCE}" \
${INCLUDEPARAM} \ ${INCLUDEPARAM} \
${EXCLUDEPARAM} \ ${EXCLUDEPARAM} \
${BIRDWEATHER_ID_PARAM}) ${BIRDWEATHER_ID_PARAM}
if [ ! -z $HEARTBEAT_URL ]; then
echo -e "${output}" echo "Performing Heartbeat"
IP=`curl -s ${HEARTBEAT_URL}`
if [ -z "$output" ] || [ "${#output}" -lt 5 ]; then echo "Heartbeat: $IP"
echo "BirdNET Analysis Server is hung or down, attempting to restart it..."
sudo ~/BirdNET-Pi/scripts/restart_services.sh
else
if [ ! -z $HEARTBEAT_URL ]; then
echo "Performing Heartbeat"
IP=`curl -s ${HEARTBEAT_URL}`
echo "Heartbeat: $IP"
fi
fi fi
done done
} }
@@ -177,15 +169,8 @@ run_birdnet() {
run_analysis "${1}" run_analysis "${1}"
} }
count=0 until grep 5050 <(netstat -tulpn 2>&1) &> /dev/null 2>&1;do
until grep 5050 <(netstat -tulpn 2>&1) &> /dev/null 2>&1; do
sleep 1 sleep 1
count=$((count+1))
if [[ $count -eq 30 ]]; then
echo "BirdNET Analysis Server is hung or down, attempting to restart it..."
sudo ~/BirdNET-Pi/scripts/restart_services.sh
count=0
fi
done done
if [ $(find ${RECS_DIR}/StreamData -maxdepth 1 -name '*wav' 2>/dev/null| wc -l) -gt 0 ];then if [ $(find ${RECS_DIR}/StreamData -maxdepth 1 -name '*wav' 2>/dev/null| wc -l) -gt 0 ];then