From fae9fff24ca840314f5ce39faeb95a1e55164aab Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 27 Jul 2018 21:37:53 -0700
Subject: [PATCH] Unify logging initialization

---
 src/bin/bench-tps.rs | 4 ++--
 src/bin/drone.rs     | 4 ++--
 src/bin/fullnode.rs  | 4 ++--
 src/bin/wallet.rs    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bin/bench-tps.rs b/src/bin/bench-tps.rs
index 971ee88cad..1a4b90ce92 100644
--- a/src/bin/bench-tps.rs
+++ b/src/bin/bench-tps.rs
@@ -1,6 +1,5 @@
 extern crate bincode;
 extern crate clap;
-extern crate env_logger;
 extern crate influx_db_client;
 extern crate rayon;
 extern crate serde_json;
@@ -14,6 +13,7 @@ use solana::crdt::{Crdt, NodeInfo};
 use solana::drone::{DroneRequest, DRONE_PORT};
 use solana::fullnode::Config;
 use solana::hash::Hash;
+use solana::logger;
 use solana::metrics;
 use solana::nat::{udp_public_bind, udp_random_bind, UdpSocketPair};
 use solana::ncp::Ncp;
@@ -326,7 +326,7 @@ fn compute_and_report_stats(
 }
 
 fn main() {
-    env_logger::init();
+    logger::setup();
     metrics::set_panic_hook("bench-tps");
     let mut threads = 4usize;
     let mut num_nodes = 1usize;
diff --git a/src/bin/drone.rs b/src/bin/drone.rs
index 92cc289bf1..7f29f181e7 100644
--- a/src/bin/drone.rs
+++ b/src/bin/drone.rs
@@ -1,6 +1,5 @@
 extern crate bincode;
 extern crate clap;
-extern crate env_logger;
 extern crate serde_json;
 extern crate solana;
 extern crate tokio;
@@ -12,6 +11,7 @@ use clap::{App, Arg};
 use solana::crdt::NodeInfo;
 use solana::drone::{Drone, DroneRequest, DRONE_PORT};
 use solana::fullnode::Config;
+use solana::logger;
 use solana::metrics::set_panic_hook;
 use solana::signature::read_keypair;
 use std::fs::File;
@@ -23,7 +23,7 @@ use tokio::prelude::*;
 use tokio_codec::{BytesCodec, Decoder};
 
 fn main() {
-    env_logger::init();
+    logger::setup();
     set_panic_hook("drone");
     let matches = App::new("drone")
         .arg(
diff --git a/src/bin/fullnode.rs b/src/bin/fullnode.rs
index a3e8d0e4f7..5b1463b56f 100644
--- a/src/bin/fullnode.rs
+++ b/src/bin/fullnode.rs
@@ -1,5 +1,4 @@
 extern crate clap;
-extern crate env_logger;
 extern crate getopts;
 extern crate log;
 extern crate serde_json;
@@ -8,6 +7,7 @@ extern crate solana;
 use clap::{App, Arg};
 use solana::crdt::{NodeInfo, TestNode};
 use solana::fullnode::{Config, FullNode, LedgerFile};
+use solana::logger;
 use solana::metrics::set_panic_hook;
 use solana::service::Service;
 use solana::signature::{KeyPair, KeyPairUtil};
@@ -17,7 +17,7 @@ use std::process::exit;
 //use std::time::Duration;
 
 fn main() -> () {
-    env_logger::init();
+    logger::setup();
     set_panic_hook("fullnode");
     let matches = App::new("fullnode")
         .arg(
diff --git a/src/bin/wallet.rs b/src/bin/wallet.rs
index 1cf389fc9f..6d03454595 100644
--- a/src/bin/wallet.rs
+++ b/src/bin/wallet.rs
@@ -3,7 +3,6 @@ extern crate bincode;
 extern crate bs58;
 extern crate clap;
 extern crate dirs;
-extern crate env_logger;
 extern crate serde_json;
 extern crate solana;
 
@@ -12,6 +11,7 @@ use clap::{App, Arg, SubCommand};
 use solana::crdt::NodeInfo;
 use solana::drone::{DroneRequest, DRONE_PORT};
 use solana::fullnode::Config;
+use solana::logger;
 use solana::signature::{read_keypair, KeyPair, KeyPairUtil, PublicKey, Signature};
 use solana::thin_client::ThinClient;
 use std::error;
@@ -350,7 +350,7 @@ fn request_airdrop(
 }
 
 fn main() -> Result<(), Box<error::Error>> {
-    env_logger::init();
+    logger::setup();
     let config = parse_args()?;
     let mut client = mk_client(&config.leader)?;
     process_command(&config, &mut client)