From 7796e8781482276579fe3ac89ca9c9e2ca4c1f96 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 27 Jul 2019 07:46:45 -0700
Subject: [PATCH] Revert "Default log level to to RUST_LOG=solana=info (#5296)"
 (#5302)

This reverts commit c63a38ae5798035e0fcd39e12fb1329c83c02a0f.
---
 Cargo.lock               | 2 +-
 gossip/Cargo.toml        | 2 +-
 gossip/src/main.rs       | 2 +-
 logger/src/lib.rs        | 2 +-
 multinode-demo/common.sh | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fe039f6cf..fcdc30eb78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3460,9 +3460,9 @@ name = "solana-gossip"
 version = "0.17.0"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana 0.17.0",
  "solana-client 0.17.0",
- "solana-logger 0.17.0",
  "solana-netutil 0.17.0",
  "solana-sdk 0.17.0",
 ]
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index a62eda2b1a..7210a41f41 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -10,9 +10,9 @@ homepage = "https://solana.com/"
 
 [dependencies]
 clap = "2.33.0"
+env_logger = "0.6.2"
 solana = { path = "../core", version = "0.17.0" }
 solana-client = { path = "../client", version = "0.17.0" }
-solana-logger = { path = "../logger", version = "0.17.0" }
 solana-netutil = { path = "../netutil", version = "0.17.0" }
 solana-sdk = { path = "../sdk", version = "0.17.0" }
 
diff --git a/gossip/src/main.rs b/gossip/src/main.rs
index 2a6578f98f..a80963bbca 100644
--- a/gossip/src/main.rs
+++ b/gossip/src/main.rs
@@ -20,7 +20,7 @@ fn pubkey_validator(pubkey: String) -> Result<(), String> {
 }
 
 fn main() -> Result<(), Box<dyn error::Error>> {
-    solana_logger::setup();
+    env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("solana=info")).init();
 
     let mut entrypoint_addr = SocketAddr::from(([127, 0, 0, 1], 8001));
     let entrypoint_string = entrypoint_addr.to_string();
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index f3510c8979..fdc5d04d5f 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -9,7 +9,7 @@ static INIT: Once = Once::new();
 /// Setup function that is only run once, even if called multiple times.
 pub fn setup() {
     INIT.call_once(|| {
-        env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("solana=info"))
+        env_logger::Builder::from_default_env()
             .default_format_timestamp_nanos(true)
             .init();
     });
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index bec76498be..37b412cbee 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -60,6 +60,7 @@ solana_ledger_tool=$(solana_program ledger-tool)
 solana_wallet=$(solana_program wallet)
 solana_replicator=$(solana_program replicator)
 
+export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 export RUST_BACKTRACE=1
 
 # shellcheck source=scripts/configure-metrics.sh