aboutsummaryrefslogtreecommitdiff
path: root/integration/test.sh
diff options
context:
space:
mode:
authorGrégoire Détrez <gregoire@mullvad.net>2022-09-02 08:06:42 +0200
committerGrégoire Détrez <gregoire@mullvad.net>2022-09-02 08:30:42 +0200
commit5a4b70db07f0996d53399033c0734915f30548fc (patch)
tree61d7bdfffe13aee42ff1728171b7ac4f14ae1d65 /integration/test.sh
parent0c97ea29fe2834d7834dfeb8cbb3579f45d105e2 (diff)
Kill trillian_log_server twicegregoire/update-trillian
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.
Diffstat (limited to 'integration/test.sh')
-rwxr-xr-xintegration/test.sh3
1 files changed, 2 insertions, 1 deletions
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