Browse Source

fix for dojo hanging on shutdown

(force kill of "docker exec" used for testing bitcoind shutdown if command hangs more than 12s)
fix_mydojo_hang_backport
kenshin-samourai 5 years ago
parent
commit
9af61f7622
  1. 5
      docker/my-dojo/bitcoin/restart.sh
  2. 4
      docker/my-dojo/dojo.sh

5
docker/my-dojo/bitcoin/restart.sh

@ -41,9 +41,8 @@ fi
bitcoind "${bitcoind_options[@]}"
# Loop keeping the container up
# after bitcoind has been stopped
# Keep the container up
while true
do
tail -f /dev/null > /dev/null
sleep 1
done

4
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

Loading…
Cancel
Save