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

fix only wait for sub-procs on bash versions 5.1 or above

Browse Source
This commit is contained in:
Thomas Oettli
2024-11-04 10:16:15 +01:00
parent d5d807c7c3
commit e84310932e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
snmpd-oid-daemon.sh
View File

@@ -577,10 +577,10 @@ while :; do
fd=${fdtable[$func]:--1} fd=${fdtable[$func]:--1}
if (( fd == -1 )); then if (( fd == -1 )); then
exec {data}< <($func </dev/null) exec {data}< <($func </dev/null)
pid=$! pid=$!
echo "gather: executed $func (PID $pid, FD $data)" >&$DEBUGLOG echo "gather: executed $func (PID $pid, FD $data)" >&$DEBUGLOG
fdtable[$func]=$data fdtable[$func]=$data
pidtable[$func]=$pid pidtable[$func]=$pid
else else
pid=${pidtable[$func]} pid=${pidtable[$func]}
echo "gather: skip executing $func, it is still running (PID $pid, FD $fd)" >&2 echo "gather: skip executing $func, it is still running (PID $pid, FD $fd)" >&2
@@ -610,8 +610,12 @@ while :; do
ps -p $pid >/dev/null && kill -SIGKILL $pid ps -p $pid >/dev/null && kill -SIGKILL $pid
rc=137 rc=137
else else
wait $pid if (( ${BASH_VERSINFO[0]} >= 5 )) && (( ${BASH_VERSINFO[1]} >= 1 )); then
rc=$? wait $pid
rc=$?
else
rc=0
fi
fi fi
echo "gather: $func (PID $pid, FD $fd) exited with rc = $rc" >&$DEBUGLOG echo "gather: $func (PID $pid, FD $fd) exited with rc = $rc" >&$DEBUGLOG
if (( rc == 0 )) && [ -n "$data" ]; then if (( rc == 0 )) && [ -n "$data" ]; then