From 28431ff22c56d188b1c5121966293d6bbe85eca6 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 9 Jan 2019 12:57:00 -0700
Subject: [PATCH] Add configurable RUST_LOG for ./net.sh sanity

---
 net/net.sh                  | 7 +++----
 net/remote/remote-sanity.sh | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index 835aa5497c..9b78a2e6fb 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -37,9 +37,6 @@ Operate a configured testnet
    -r                          - Reuse existing node/ledger configuration from a
                                  previous |start| (ie, don't run ./mulitnode-demo/setup.sh).
 
-   Note: if RUST_LOG is set in the environment it will be propogated into the
-         network nodes.
-
  sanity/start/update-specific options:
    -o noLedgerVerify    - Skip ledger verification
    -o noValidatorSanity - Skip fullnode sanity
@@ -51,6 +48,8 @@ Operate a configured testnet
  logs-specific options:
    none
 
+Note: if RUST_LOG is set in the environment it will be propogated into the
+      network nodes.
 EOF
   exit $exitcode
 }
@@ -278,7 +277,7 @@ sanity() {
     set -x
     # shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
     ssh "${sshOptions[@]}" "$host" \
-      "./solana/net/remote/remote-sanity.sh $sanityExtraArgs"
+      "./solana/net/remote/remote-sanity.sh $sanityExtraArgs \"$RUST_LOG\""
   ) || ok=false
 
   $metricsWriteDatapoint "testnet-deploy net-sanity-complete=1"
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index 9e60624c82..03688585f7 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -50,6 +50,9 @@ while [[ $1 = -o ]]; do
   esac
 done
 
+RUST_LOG="$1"
+export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
+
 source net/common.sh
 loadConfigFile