spacefreak/snmpd-oid-daemon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

send data and ENDOFDATA to main depending on rc and data availability

Browse Source
This commit is contained in:
Thomas Oettli
2024-11-01 21:56:45 +01:00
parent add8e44e4f
commit 201456a056
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
snmpd-oid-daemon.sh
View File

@@ -219,7 +219,6 @@ function submit_oids() {
echo -n "UPDATE " echo -n "UPDATE "
declare -p oids | strip_declaration declare -p oids | strip_declaration
fi fi
echo ENDOFDATA
return 0 return 0
} }
@@ -575,21 +574,15 @@ while :; do
((next_update+=delay)) ((next_update+=delay))
timetable[$func]=$next_update timetable[$func]=$next_update
$first_run && echo "starting $func (refresh every $delay seconds)" >&$LOG $first_run && echo "starting $func (refresh every $delay seconds)" >&$LOG
echo "gathering: executing $func" echo "gathering: executing $func" >&$DEBUGLOG
data=$($func) data=$($func </dev/null)
rc=$? rc=$?
echo "gathering: $func exited (rc=$rc), schedule next refresh at $(date -d @$next_update)" >&$DEBUGLOG echo "gathering: $func exited (rc=$rc), schedule next refresh at $(date -d @$next_update)" >&$DEBUGLOG
# pipe gathered data to main if (( rc == 0 )) && [ -n "$data" ]; then
while read -r line; do echo "gathering: sending data to main" >&$DEBUGLOG
echo "gathering: received: $line" echo "$data" 1>&$DATAIN
last_line=$line echo "ENDOFDATA" >&$DATAIN
done <<< "$data"
if [ "$last_line" != "ENDOFDATA" ]; then
echo "gathering: $func did not return ENDOFDATA, skipping data" >&2
continue
fi fi
echo "gathering: sending data update to main"
echo "$data" >&$DATAIN
fi fi
done done