diff mbox series

[Openvpn-devel,XS] Change in openvpn[master]: t_server_null: forcibly kill misbehaving servers

Message ID 3086a86985d7f9217cde0db8b3104088fe6c513c-HTML@gerrit.openvpn.net
State New
Headers show
Series [Openvpn-devel,XS] Change in openvpn[master]: t_server_null: forcibly kill misbehaving servers | expand

Commit Message

flichtenheld (Code Review) Oct. 4, 2024, 6 a.m. UTC 
Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/775?usp=email

to review the following change.


Change subject: t_server_null: forcibly kill misbehaving servers
......................................................................

t_server_null: forcibly kill misbehaving servers

Change-Id: Ic0f98cd3b87a7b86e032e63167ac9036f7c08fcb
Signed-off-by: Samuli Seppänen <samuli.seppanen@gmail.com>
---
M tests/t_server_null_server.sh
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/775/1
diff mbox series

Patch

diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh
index 10bb44b..dea2a04 100755
--- a/tests/t_server_null_server.sh
+++ b/tests/t_server_null_server.sh
@@ -88,9 +88,9 @@ 
     fi
 
     if [ -z "${RUN_SUDO}" ]; then
-        $KILL_EXEC "${SERVER_PID}"
+        $KILL_EXEC -15 "${SERVER_PID}" || $KILL_EXEC -9 "${SERVER_PID}"
     else
-        $RUN_SUDO $KILL_EXEC "${SERVER_PID}"
+        $RUN_SUDO $KILL_EXEC -15 "${SERVER_PID}" || $RUN_SUDO $KILL_EXEC -9 "${SERVER_PID}"
     fi
 
     count=0