blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Terminate child process when main script is interrupted

This commit is contained in:
Michael Vines 2018-07-30 14:29:34 -07:00
parent 95b98b3845
commit 647053e973
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multinode-demo/drone.sh
View File

@ -36,7 +36,10 @@ set -ex
mkdir -p "$SOLANA_CONFIG_DIR" mkdir -p "$SOLANA_CONFIG_DIR"
$rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_DIR"/ $rsync -vPz "$rsync_leader_url"/config/leader.json "$SOLANA_CONFIG_DIR"/
set -o pipefail
trap 'kill "$pid" && wait "$pid"' INT TERM
$solana_drone \ $solana_drone \
-l "$SOLANA_CONFIG_DIR"/leader.json -k "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json \ -l "$SOLANA_CONFIG_DIR"/leader.json -k "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json \
2>&1 | $drone_logger > >($drone_logger) 2>&1 &
pid=$!
wait "$pid"

6
multinode-demo/leader.sh
View File

@ -25,8 +25,10 @@ fi
tune_networking tune_networking
set -xo pipefail trap 'kill "$pid" && wait "$pid"' INT TERM
$program \ $program \
--identity "$SOLANA_CONFIG_DIR"/leader.json \ --identity "$SOLANA_CONFIG_DIR"/leader.json \
--ledger "$SOLANA_CONFIG_DIR"/ledger.log \ --ledger "$SOLANA_CONFIG_DIR"/ledger.log \
2>&1 | $leader_logger > >($leader_logger) 2>&1 &
pid=$!
wait "$pid"

6
multinode-demo/validator.sh
View File

@ -84,9 +84,11 @@ while ! $solana_wallet \
sleep 1 sleep 1
done done
set -o pipefail trap 'kill "$pid" && wait "$pid"' INT TERM
$program \ $program \
--identity "$SOLANA_CONFIG_DIR"/validator.json \ --identity "$SOLANA_CONFIG_DIR"/validator.json \
--testnet "$leader_address:$leader_port" \ --testnet "$leader_address:$leader_port" \
--ledger "$SOLANA_LEADER_CONFIG_DIR"/ledger.log \ --ledger "$SOLANA_LEADER_CONFIG_DIR"/ledger.log \
2>&1 | $validator_logger > >($validator_logger) 2>&1 &
pid=$!
wait "$pid"