GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-08-08 09:21:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: add SIGKILL fallback in cleanup_client_server

Browse Source 
Ensure that ocserv is killed within bounded time by falling
back to a SIGKILL if ocserv does not stop on time.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
This commit is contained in:
Nikos Mavrogiannopoulos
2026-06-11 15:40:37 +02:00
parent eeef24e520
commit 29dd18ddc5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/common.sh
+11 -2
View File
@@ -247,8 +247,17 @@ cleanup_client_server() {
test -n "${CLIPID}" && test -f "${CLIPID}" && kill $(cat ${CLIPID}) >/dev/null 2>&1 test -n "${CLIPID}" && test -f "${CLIPID}" && kill $(cat ${CLIPID}) >/dev/null 2>&1
test -n "${CLIPID}" && rm -f "${CLIPID}" >/dev/null 2>&1 test -n "${CLIPID}" && rm -f "${CLIPID}" >/dev/null 2>&1
sleep 2 sleep 2
test -n "${PID}" && kill ${PID} >/dev/null 2>&1 if test -n "${PID}"; then
test -n "${PID}" && wait ${PID} 2>/dev/null kill ${PID} >/dev/null 2>&1
# Wait up to 10 s for graceful exit; force-kill if main is stuck
# (e.g. blocked on a sec-mod IPC call during shutdown).
for _cleanup_i in $(seq 1 10); do
kill -0 "${PID}" 2>/dev/null || break
sleep 1
done
kill -9 "${PID}" 2>/dev/null
wait ${PID} 2>/dev/null
fi
test -n "${PIDFILE}" && rm -f "${PIDFILE}" >/dev/null 2>&1 test -n "${PIDFILE}" && rm -f "${PIDFILE}" >/dev/null 2>&1
test -n "${CONFIG}" && rm -f "${CONFIG}" >/dev/null 2>&1 test -n "${CONFIG}" && rm -f "${CONFIG}" >/dev/null 2>&1
} }