From 2277a39dd214b4ac79844fee773ee4efef505028 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Sat, 13 Apr 2019 18:43:59 -0700 Subject: [PATCH] Default solana-gossip log-level to 'info' --- Cargo.lock | 3 ++- core/src/gossip_service.rs | 1 + gossip/Cargo.toml | 2 +- gossip/src/main.rs | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f780c098..99366ed59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2386,8 +2386,9 @@ name = "solana-gossip" version = "0.13.0" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "solana 0.13.0", - "solana-logger 0.13.0", "solana-sdk 0.13.0", ] diff --git a/core/src/gossip_service.rs b/core/src/gossip_service.rs index 9b219a185..37efee5ba 100644 --- a/core/src/gossip_service.rs +++ b/core/src/gossip_service.rs @@ -68,6 +68,7 @@ pub fn discover( let exit = Arc::new(AtomicBool::new(false)); let (gossip_service, spy_ref) = make_spy_node(gossip_addr, &exit); let id = spy_ref.read().unwrap().keypair.pubkey(); + info!("Gossip entry point: {:?}", gossip_addr); trace!( "discover: spy_node {} looking for at least {:?} nodes", id, diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 49ee3730b..767c9b3b4 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -10,8 +10,8 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" +env_logger = "0.6.1" solana = { path = "../core", version = "0.13.0" } -solana-logger = { path = "../logger", version = "0.13.0" } solana-sdk = { path = "../sdk", version = "0.13.0" } [features] diff --git a/gossip/src/main.rs b/gossip/src/main.rs index 5f664f688..bddd6347c 100644 --- a/gossip/src/main.rs +++ b/gossip/src/main.rs @@ -15,7 +15,8 @@ fn pubkey_validator(pubkey: String) -> Result<(), String> { } fn main() -> Result<(), Box> { - solana_logger::setup(); + env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("solana=info")).init(); + let mut network_addr = SocketAddr::from(([127, 0, 0, 1], 8001)); let network_string = network_addr.to_string(); let matches = App::new(crate_name!())