force kill of "docker exec" used for testing bitcoind shutdown if com…

…mand hangs more than 12s.
Samourai-Wallet · Jan 15, 2020 · 3ee85db · 3ee85db
1 parent bd43526
commit 3ee85db
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/docker/my-dojo/dojo.sh b/docker/my-dojo/dojo.sh
@@ -89,7 +89,7 @@ stop() {
     do
       echo "Waiting for shutdown of Bitcoin server."
       # Check if bitcoind rpc api is responding
-      timeout 5 docker exec -it bitcoind  bitcoin-cli \
+      timeout -k 12 10 docker exec -it bitcoind  bitcoin-cli \
         -rpcconnect=bitcoind \
         --rpcport=28256 \
         --rpcuser="$BITCOIND_RPC_USER" \
@@ -100,8 +100,6 @@ stop() {
         echo "Bitcoin server stopped."
         break
       fi
-      # Pause before next try
-      sleep 5
       i=$[$i+1]
     done
     # Bitcoin daemon is still up