diff options
| author | Grégoire Détrez <gregoire@mullvad.net> | 2022-09-02 08:06:42 +0200 |
|---|---|---|
| committer | Grégoire Détrez <gregoire@mullvad.net> | 2022-09-02 08:30:42 +0200 |
| commit | 5a4b70db07f0996d53399033c0734915f30548fc (patch) | |
| tree | 61d7bdfffe13aee42ff1728171b7ac4f14ae1d65 | |
| parent | 0c97ea29fe2834d7834dfeb8cbb3579f45d105e2 (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.
| -rwxr-xr-x | integration/test.sh | 3 |
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 |