From 5a4b70db07f0996d53399033c0734915f30548fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20D=C3=A9trez?= Date: Fri, 2 Sep 2022 08:06:42 +0200 Subject: Kill trillian_log_server twice Send SIGTERM to trillian_log_server if it hasn't exited in 5 seconds. This is a workaround for version 1.5.0 not exiting properly. --- integration/test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration/test.sh b/integration/test.sh index 95906b0..1738797 100755 --- a/integration/test.sh +++ b/integration/test.sh @@ -329,7 +329,8 @@ function node_stop_fe() { function node_stop_be() { for i in $@; do - pp ${nvars[$i:tsrv_pid]} && kill -2 ${nvars[$i:tsrv_pid]} + # The Trillian log server doesn't exit properly on SIGINT so we give it 5 second and then send SIGTERM. + pp ${nvars[$i:tsrv_pid]} && /usr/bin/kill --signal SIGINT --timeout 5000 SIGTERM ${nvars[$i:tsrv_pid]} while :; do sleep 1 -- cgit v1.2.3