Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trap docker & bash messages displayed on dojo.sh stop #161

Merged
merged 5 commits into from
Jun 9, 2020
Merged

trap docker & bash messages displayed on dojo.sh stop #161

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
452d099
trap "killed" message displayed on dojo.sh stop
kenshin-samourai Jun 9, 2020
554e12f
trap bitcoind messages displayed on dojo.sh stop
kenshin-samourai Jun 9, 2020
d4f54b2
display "preparing shutdown" message earlier
kenshin-samourai Jun 9, 2020
2fba069
trap "failed to resize tty" message in dojo.sh stop
kenshin-samourai Jun 9, 2020
5a5eb5c
add message in dojo.sh start
kenshin-samourai Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions docker/my-dojo/dojo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ start() {
isRunning=$(docker inspect --format="{{.State.Running}}" db 2> /dev/null)

if [ $? -eq 1 ] || [ "$isRunning" == "false" ]; then
echo "Starting Dojo. Please wait."
docker_up --remove-orphans
else
echo "Dojo is already running."
Expand All @@ -72,7 +73,8 @@ start() {

# Stop
stop() {
# Check if dojo is running (check the db container)
echo "Preparing shutdown of Dojo. Please wait."
# Check if dojo is running (check the db container)
isRunning=$(docker inspect --format="{{.State.Running}}" db 2> /dev/null)
if [ $? -eq 1 ] || [ "$isRunning" == "false" ]; then
echo "Dojo is already stopped."
Expand All @@ -82,29 +84,28 @@ stop() {
if [ "$BITCOIND_INSTALL" == "on" ]; then
# Renewal of bitcoind onion address
if [ "$BITCOIND_EPHEMERAL_HS" = "on" ]; then
docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind
$( docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind ) &> /dev/null
fi
# Stop the bitcoin daemon
echo "Preparing shutdown of dojo. Please wait."
docker exec -it bitcoind bitcoin-cli \
$( docker exec -it bitcoind bitcoin-cli \
-rpcconnect=bitcoind \
--rpcport=28256 \
--rpcuser="$BITCOIND_RPC_USER" \
--rpcpassword="$BITCOIND_RPC_PASSWORD" \
stop
stop ) &> /dev/null
# Check if the bitcoin daemon is still up
# wait 3mn max
i="0"
while [ $i -lt 18 ]
do
echo "Waiting for shutdown of Bitcoin server."
# Check if bitcoind rpc api is responding
timeout -k 12 10 docker exec -it bitcoind bitcoin-cli \
$( timeout -k 12 10 docker exec -it bitcoind bitcoin-cli \
-rpcconnect=bitcoind \
--rpcport=28256 \
--rpcuser="$BITCOIND_RPC_USER" \
--rpcpassword="$BITCOIND_RPC_PASSWORD" \
getblockchaininfo > /dev/null
getblockchaininfo &> /dev/null ) &> /dev/null
# rpc api is down
if [[ $? > 0 ]]; then
echo "Bitcoin server stopped."
Expand Down