From 897279eddbe6540ef8d6dcc43735cb5fedd00aaa Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 25 Feb 2019 19:41:22 -0800 Subject: [PATCH] Encapsulate log::Level so counter macro users don't need to use it --- metrics/src/counter.rs | 4 ++-- runtime/src/accounts.rs | 2 +- runtime/src/bank.rs | 2 +- src/banking_stage.rs | 1 - src/blocktree_processor.rs | 1 - src/broadcast_service.rs | 1 - src/cluster_info_vote_listener.rs | 1 - src/db_window.rs | 1 - src/fullnode.rs | 1 - src/packet.rs | 1 - src/replay_stage.rs | 1 - src/retransmit_stage.rs | 1 - src/sigverify.rs | 1 - src/sigverify_stage.rs | 1 - src/tpu_forwarder.rs | 1 - src/window_service.rs | 1 - 16 files changed, 4 insertions(+), 17 deletions(-) diff --git a/metrics/src/counter.rs b/metrics/src/counter.rs index d79f4aa530..f628918cc1 100644 --- a/metrics/src/counter.rs +++ b/metrics/src/counter.rs @@ -55,10 +55,10 @@ macro_rules! inc_new_counter { #[macro_export] macro_rules! inc_new_counter_info { ($name:expr, $count:expr) => {{ - inc_new_counter!($name, $count, Level::Info, 0); + inc_new_counter!($name, $count, log::Level::Info, 0); }}; ($name:expr, $count:expr, $lograte:expr) => {{ - inc_new_counter!($name, $count, Level::Info, $lograte); + inc_new_counter!($name, $count, log::Level::Info, $lograte); }}; } diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index f751ed0c1a..4c2350094e 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -2,7 +2,7 @@ use crate::bank::{BankError, Result}; use crate::runtime::has_duplicates; use bincode::serialize; use hashbrown::{HashMap, HashSet}; -use log::{debug, Level}; +use log::debug; use solana_metrics::counter::Counter; use solana_sdk::account::Account; use solana_sdk::hash::{hash, Hash}; diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 4688637282..67e2e5b4ed 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -10,7 +10,7 @@ use crate::runtime::{self, RuntimeError}; use crate::status_cache::StatusCache; use bincode::serialize; use hashbrown::HashMap; -use log::{debug, info, warn, Level}; +use log::{debug, info, warn}; use solana_metrics::counter::Counter; use solana_sdk::account::Account; use solana_sdk::bpf_loader; diff --git a/src/banking_stage.rs b/src/banking_stage.rs index 46f1be89ca..de0181b9b2 100644 --- a/src/banking_stage.rs +++ b/src/banking_stage.rs @@ -12,7 +12,6 @@ use crate::result::{Error, Result}; use crate::service::Service; use crate::sigverify_stage::VerifiedPackets; use bincode::deserialize; -use log::Level; use solana_metrics::counter::Counter; use solana_runtime::bank::{self, Bank, BankError}; use solana_sdk::hash::Hash; diff --git a/src/blocktree_processor.rs b/src/blocktree_processor.rs index 4ccbbde15c..e98d35ab7e 100644 --- a/src/blocktree_processor.rs +++ b/src/blocktree_processor.rs @@ -2,7 +2,6 @@ use crate::bank_forks::BankForks; use crate::blocktree::Blocktree; use crate::entry::{Entry, EntrySlice}; use crate::leader_scheduler::LeaderScheduler; -use log::Level; use rayon::prelude::*; use solana_metrics::counter::Counter; use solana_runtime::bank::{Bank, BankError, Result}; diff --git a/src/broadcast_service.rs b/src/broadcast_service.rs index 0274f707f2..a829c30711 100644 --- a/src/broadcast_service.rs +++ b/src/broadcast_service.rs @@ -9,7 +9,6 @@ use crate::erasure::CodingGenerator; use crate::packet::index_blobs; use crate::result::{Error, Result}; use crate::service::Service; -use log::Level; use rayon::prelude::*; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; diff --git a/src/cluster_info_vote_listener.rs b/src/cluster_info_vote_listener.rs index 4ccc2fa5d5..bc057be096 100644 --- a/src/cluster_info_vote_listener.rs +++ b/src/cluster_info_vote_listener.rs @@ -3,7 +3,6 @@ use crate::packet; use crate::result::Result; use crate::service::Service; use crate::streamer::PacketSender; -use log::Level; use solana_metrics::counter::Counter; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, RwLock}; diff --git a/src/db_window.rs b/src/db_window.rs index e068eee18a..0baa8344e7 100644 --- a/src/db_window.rs +++ b/src/db_window.rs @@ -6,7 +6,6 @@ use crate::leader_scheduler::LeaderScheduler; use crate::packet::{SharedBlob, BLOB_HEADER_SIZE}; use crate::result::Result; use crate::streamer::BlobSender; -use log::Level; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; use solana_sdk::pubkey::Pubkey; diff --git a/src/fullnode.rs b/src/fullnode.rs index 8a1b4159d0..6000842620 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -14,7 +14,6 @@ use crate::service::Service; use crate::storage_stage::StorageState; use crate::tpu::Tpu; use crate::tvu::{Sockets, Tvu, TvuRotationInfo, TvuRotationReceiver}; -use log::Level; use solana_metrics::counter::Counter; use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::pubkey::Pubkey; diff --git a/src/packet.rs b/src/packet.rs index 1ccfbbb0b0..abee26f5f5 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -3,7 +3,6 @@ use crate::recvmmsg::{recv_mmsg, NUM_RCVMMSGS}; use crate::result::{Error, Result}; use bincode::{serialize, serialize_into}; use byteorder::{ByteOrder, LittleEndian}; -use log::Level; use serde::Serialize; use solana_metrics::counter::Counter; pub use solana_sdk::packet::PACKET_DATA_SIZE; diff --git a/src/replay_stage.rs b/src/replay_stage.rs index 012b8749f5..e7f74cbd7e 100644 --- a/src/replay_stage.rs +++ b/src/replay_stage.rs @@ -11,7 +11,6 @@ use crate::result::{Error, Result}; use crate::rpc_subscriptions::RpcSubscriptions; use crate::service::Service; use crate::tvu::{TvuRotationInfo, TvuRotationSender}; -use log::Level; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; use solana_runtime::bank::Bank; diff --git a/src/retransmit_stage.rs b/src/retransmit_stage.rs index b24a4b5e2a..59b0160850 100644 --- a/src/retransmit_stage.rs +++ b/src/retransmit_stage.rs @@ -12,7 +12,6 @@ use crate::result::{Error, Result}; use crate::service::Service; use crate::streamer::BlobReceiver; use crate::window_service::WindowService; -use log::Level; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; use std::net::UdpSocket; diff --git a/src/sigverify.rs b/src/sigverify.rs index 947562dad0..4ed44ee91d 100644 --- a/src/sigverify.rs +++ b/src/sigverify.rs @@ -6,7 +6,6 @@ use crate::packet::{Packet, SharedPackets}; use crate::result::Result; -use log::Level; use solana_metrics::counter::Counter; use solana_sdk::pubkey::Pubkey; use solana_sdk::shortvec::decode_len; diff --git a/src/sigverify_stage.rs b/src/sigverify_stage.rs index efc1af6f0b..94e2f6bb36 100644 --- a/src/sigverify_stage.rs +++ b/src/sigverify_stage.rs @@ -10,7 +10,6 @@ use crate::result::{Error, Result}; use crate::service::Service; use crate::sigverify; use crate::streamer::{self, PacketReceiver}; -use log::Level; use rand::{thread_rng, Rng}; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; diff --git a/src/tpu_forwarder.rs b/src/tpu_forwarder.rs index 80421d3585..a65ffdc13e 100644 --- a/src/tpu_forwarder.rs +++ b/src/tpu_forwarder.rs @@ -7,7 +7,6 @@ use crate::cluster_info::ClusterInfo; use crate::contact_info::ContactInfo; use crate::service::Service; use crate::streamer::{self, PacketReceiver}; -use log::Level; use solana_metrics::counter::Counter; use solana_sdk::pubkey::Pubkey; use std::net::{SocketAddr, UdpSocket}; diff --git a/src/window_service.rs b/src/window_service.rs index 39f638bf98..b1292d7383 100644 --- a/src/window_service.rs +++ b/src/window_service.rs @@ -8,7 +8,6 @@ use crate::repair_service::RepairService; use crate::result::{Error, Result}; use crate::service::Service; use crate::streamer::{BlobReceiver, BlobSender}; -use log::Level; use solana_metrics::counter::Counter; use solana_metrics::{influxdb, submit}; use solana_sdk::pubkey::Pubkey;