From 0dc5af62ffc5b863d78b14b35f2995fefea47c11 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 27 Feb 2019 20:57:01 -0800 Subject: [PATCH] Standardize on 'use log::*' for easy access to all log level macros --- drone/src/bin/drone.rs | 2 +- drone/src/drone.rs | 2 +- metrics/src/counter.rs | 2 +- netutil/src/lib.rs | 2 +- programs/native/storage/tests/storage.rs | 2 +- runtime/src/accounts.rs | 2 +- runtime/src/appendvec.rs | 2 +- runtime/src/bank.rs | 2 +- src/cluster_info.rs | 3 +-- src/thin_client.rs | 5 ++--- tests/crds_gossip.rs | 2 +- tests/tvu.rs | 2 +- 12 files changed, 13 insertions(+), 15 deletions(-) diff --git a/drone/src/bin/drone.rs b/drone/src/bin/drone.rs index 6f980599c..595102d87 100644 --- a/drone/src/bin/drone.rs +++ b/drone/src/bin/drone.rs @@ -1,5 +1,5 @@ use clap::{crate_version, App, Arg}; -use log::info; +use log::*; use solana_drone::drone::{Drone, DRONE_PORT}; use solana_drone::socketaddr; use solana_sdk::signature::read_keypair; diff --git a/drone/src/drone.rs b/drone/src/drone.rs index da8f6fddc..a848d295c 100644 --- a/drone/src/drone.rs +++ b/drone/src/drone.rs @@ -7,7 +7,7 @@ use bincode::{deserialize, serialize}; use byteorder::{ByteOrder, LittleEndian}; use bytes::{Bytes, BytesMut}; -use log::{debug, info, trace, warn}; +use log::*; use serde_derive::{Deserialize, Serialize}; use solana_metrics; use solana_metrics::influxdb; diff --git a/metrics/src/counter.rs b/metrics/src/counter.rs index f628918cc..2002a5a3f 100644 --- a/metrics/src/counter.rs +++ b/metrics/src/counter.rs @@ -1,5 +1,5 @@ use crate::{influxdb, submit}; -use log::{info, log_enabled}; +use log::*; use solana_sdk::timing; use std::env; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/netutil/src/lib.rs b/netutil/src/lib.rs index 99f1ad372..a1ae16b9d 100644 --- a/netutil/src/lib.rs +++ b/netutil/src/lib.rs @@ -1,5 +1,5 @@ //! The `netutil` module assists with networking -use log::trace; +use log::*; use nix::sys::socket::setsockopt; use nix::sys::socket::sockopt::{ReuseAddr, ReusePort}; use pnet_datalink as datalink; diff --git a/programs/native/storage/tests/storage.rs b/programs/native/storage/tests/storage.rs index 3687de7c2..a3e70f7a1 100644 --- a/programs/native/storage/tests/storage.rs +++ b/programs/native/storage/tests/storage.rs @@ -1,5 +1,5 @@ use bincode::deserialize; -use log::info; +use log::*; use solana_runtime::bank::Bank; use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::hash::{hash, Hash}; diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index fe4d19461..1b0d7da1c 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -3,7 +3,7 @@ use crate::bank::{BankError, Result}; use crate::runtime::has_duplicates; use bincode::serialize; use hashbrown::{HashMap, HashSet}; -use log::debug; +use log::*; use solana_metrics::counter::Counter; use solana_sdk::account::Account; use solana_sdk::hash::{hash, Hash}; diff --git a/runtime/src/appendvec.rs b/runtime/src/appendvec.rs index 1868d06d3..d2151edc6 100644 --- a/runtime/src/appendvec.rs +++ b/runtime/src/appendvec.rs @@ -225,7 +225,7 @@ where #[cfg(test)] pub mod tests { use super::*; - use log::info; + use log::*; use rand::{thread_rng, Rng}; use solana_sdk::timing::{duration_as_ms, duration_as_s}; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index ea4ed062c..3e5f86c29 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -9,7 +9,7 @@ use crate::runtime::{self, RuntimeError}; use crate::status_cache::StatusCache; use bincode::serialize; use hashbrown::HashMap; -use log::{debug, info, warn}; +use log::*; use solana_metrics::counter::Counter; use solana_sdk::account::Account; use solana_sdk::bpf_loader; diff --git a/src/cluster_info.rs b/src/cluster_info.rs index c4953d83e..ba3d7f7ff 100644 --- a/src/cluster_info.rs +++ b/src/cluster_info.rs @@ -26,7 +26,6 @@ use crate::streamer::{BlobReceiver, BlobSender}; use bincode::{deserialize, serialize}; use core::cmp; use hashbrown::HashMap; -use log::Level; use rand::{thread_rng, Rng}; use rayon::prelude::*; use solana_metrics::counter::Counter; @@ -642,7 +641,7 @@ impl ClusterInfo { .flat_map(|(b, vs)| { let blob = b.read().unwrap(); - let ids_and_tvus = if log_enabled!(Level::Trace) { + let ids_and_tvus = if log_enabled!(log::Level::Trace) { let v_ids = vs.iter().map(|v| v.id); let tvus = vs.iter().map(|v| v.tvu); let ids_and_tvus = v_ids.zip(tvus).collect(); diff --git a/src/thin_client.rs b/src/thin_client.rs index a182bd320..8b4e1af81 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -11,7 +11,6 @@ use crate::result::{Error, Result}; use crate::rpc_request::{RpcClient, RpcRequest, RpcRequestHandler}; use bincode::serialize_into; use bs58; -use log::Level; use serde_json; use solana_metrics; use solana_metrics::influxdb; @@ -410,7 +409,7 @@ pub fn poll_gossip_for_leader(leader_gossip: SocketAddr, timeout: Option) - break; } - if log_enabled!(Level::Trace) { + if log_enabled!(log::Level::Trace) { trace!("{}", cluster_info.read().unwrap().node_info_trace()); } @@ -423,7 +422,7 @@ pub fn poll_gossip_for_leader(leader_gossip: SocketAddr, timeout: Option) - gossip_service.close()?; - if log_enabled!(Level::Trace) { + if log_enabled!(log::Level::Trace) { trace!("{}", cluster_info.read().unwrap().node_info_trace()); } diff --git a/tests/crds_gossip.rs b/tests/crds_gossip.rs index 440a0bf13..f8bf26e67 100644 --- a/tests/crds_gossip.rs +++ b/tests/crds_gossip.rs @@ -1,6 +1,6 @@ use bincode::serialized_size; use hashbrown::HashMap; -use log::trace; +use log::*; use rayon::prelude::*; use solana::cluster_info::NodeInfo; use solana::contact_info::ContactInfo; diff --git a/tests/tvu.rs b/tests/tvu.rs index 76e863895..9ddabed7d 100644 --- a/tests/tvu.rs +++ b/tests/tvu.rs @@ -1,7 +1,7 @@ #[macro_use] extern crate solana; -use log::trace; +use log::*; use solana::bank_forks::BankForks; use solana::blocktree::{get_tmp_ledger_path, Blocktree}; use solana::blocktree_processor::BankForksInfo;