From 95bf91537e51e6e4aa9d62791c1fbf256dd2dffc Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 4 May 2022 09:23:15 -0300 Subject: [PATCH] Simplify api init script --- docker/api-init.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/api-init.sh b/docker/api-init.sh index 13ec34b..859eac9 100644 --- a/docker/api-init.sh +++ b/docker/api-init.sh @@ -1,7 +1,10 @@ #!/usr/bin/env bash + pid=0 + # SIGTERM-handler termination_handler() { + exit_status=0 if [ $pid -ne 0 ]; then echo 'SIGTERM was received, stopping the API' curl --silent --fail --request POST \ @@ -11,14 +14,12 @@ termination_handler() { --data '{"jsonrpc": "2.0" ,"method": "shutdown"}' \ http://localhost:"${STARGATE__PORT}"/operations/application-control wait "$pid" + exit_status=$? fi - exit 143; # 128 + 15 -- SIGTERM + exit "$exit_status" } -trap 'kill ${!}; termination_handler' SIGTERM + +trap 'termination_handler' SIGTERM ./api-start.sh & pid="$!" -# wait forever -while true -do - tail -f /dev/null & wait ${!} -done +wait "$pid"