From 39354c06f8a9dd8d0eca3633f8531206683c7412 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Wed, 27 Jun 2018 10:51:37 -0700 Subject: [PATCH] take multiple log files, allow restart of leader, validator --- multinode-demo/leader.sh | 3 ++- multinode-demo/validator.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh index 733f068086..4013c32877 100755 --- a/multinode-demo/leader.sh +++ b/multinode-demo/leader.sh @@ -24,5 +24,6 @@ fi # shellcheck disable=SC2086 # $program should not be quoted exec $program \ -l "$SOLANA_CONFIG_DIR"/leader.json \ - < "$SOLANA_CONFIG_DIR"/genesis.log "$SOLANA_CONFIG_DIR"/tx-*.log \ + < <(shopt -s nullglob && cat "$SOLANA_CONFIG_DIR"/genesis.log \ + "$SOLANA_CONFIG_DIR"/tx-*.log) \ > "$SOLANA_CONFIG_DIR"/tx-"$(date -u +%Y%m%d%H%M%S%N)".log diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index 3d903b6c8c..7fa785733e 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -72,4 +72,5 @@ ls -lh "$SOLANA_LEADER_CONFIG_DIR" # shellcheck disable=SC2086 # $program should not be quoted exec $program \ -l "$SOLANA_CONFIG_DIR"/validator.json -t "$leader_address:$leader_port" \ - < "$SOLANA_LEADER_CONFIG_DIR"/genesis.log "$SOLANA_LEADER_CONFIG_DIR"/tx-*.log + < <(shopt -s nullglob && cat "$SOLANA_LEADER_CONFIG_DIR"/genesis.log \ + "$SOLANA_LEADER_CONFIG_DIR"/tx-*.log)