Avoid setting RUST_LOG to the empty string (#5338)
This commit is contained in:
parent
c209e14e40
commit
9b8b7dbfd7
|
@ -8,11 +8,12 @@ echo "$(date) | $0 $*" > client.log
|
||||||
deployMethod="$1"
|
deployMethod="$1"
|
||||||
entrypointIp="$2"
|
entrypointIp="$2"
|
||||||
clientToRun="$3"
|
clientToRun="$3"
|
||||||
RUST_LOG="$4"
|
if [[ -n $4 ]]; then
|
||||||
|
export RUST_LOG="$4"
|
||||||
|
fi
|
||||||
benchTpsExtraArgs="$5"
|
benchTpsExtraArgs="$5"
|
||||||
benchExchangeExtraArgs="$6"
|
benchExchangeExtraArgs="$6"
|
||||||
clientIndex="$7"
|
clientIndex="$7"
|
||||||
export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
|
|
||||||
|
|
||||||
missing() {
|
missing() {
|
||||||
echo "Error: $1 not specified"
|
echo "Error: $1 not specified"
|
||||||
|
|
|
@ -25,8 +25,9 @@ missing() {
|
||||||
[[ -n $updatePlatform ]] || missing updatePlatform
|
[[ -n $updatePlatform ]] || missing updatePlatform
|
||||||
[[ -f update_manifest_keypair.json ]] || missing update_manifest_keypair.json
|
[[ -f update_manifest_keypair.json ]] || missing update_manifest_keypair.json
|
||||||
|
|
||||||
RUST_LOG="$2"
|
if [[ -n $2 ]]; then
|
||||||
export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
|
export RUST_LOG="$2"
|
||||||
|
fi
|
||||||
|
|
||||||
source net/common.sh
|
source net/common.sh
|
||||||
loadConfigFile
|
loadConfigFile
|
||||||
|
|
|
@ -8,7 +8,9 @@ deployMethod="$1"
|
||||||
nodeType="$2"
|
nodeType="$2"
|
||||||
entrypointIp="$3"
|
entrypointIp="$3"
|
||||||
numNodes="$4"
|
numNodes="$4"
|
||||||
RUST_LOG="$5"
|
if [[ -n $5 ]]; then
|
||||||
|
export RUST_LOG="$5"
|
||||||
|
fi
|
||||||
skipSetup="$6"
|
skipSetup="$6"
|
||||||
failOnValidatorBootupFailure="$7"
|
failOnValidatorBootupFailure="$7"
|
||||||
externalPrimordialAccountsFile="$8"
|
externalPrimordialAccountsFile="$8"
|
||||||
|
@ -23,7 +25,6 @@ benchExchangeExtraArgs="${16}"
|
||||||
genesisOptions="${17}"
|
genesisOptions="${17}"
|
||||||
extraNodeArgs="${18}"
|
extraNodeArgs="${18}"
|
||||||
set +x
|
set +x
|
||||||
export RUST_LOG
|
|
||||||
|
|
||||||
# Use a very large stake (relative to the default multinode-demo/ stake of 42)
|
# Use a very large stake (relative to the default multinode-demo/ stake of 42)
|
||||||
# for the testnet validators setup by net/. This make it less likely that
|
# for the testnet validators setup by net/. This make it less likely that
|
||||||
|
|
|
@ -60,8 +60,9 @@ while [[ $1 = -o ]]; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
RUST_LOG="$1"
|
if [[ -n $1 ]]; then
|
||||||
export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
|
export RUST_LOG="$1"
|
||||||
|
fi
|
||||||
|
|
||||||
source net/common.sh
|
source net/common.sh
|
||||||
loadConfigFile
|
loadConfigFile
|
||||||
|
|
Loading…
Reference in New Issue