pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 09:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

babe, grandpa: restrict info logging during initial sync (#5564)

Browse Source 
* babe: restrict info logging during initial sync

* grandpa: restrict info logging during initial sync

* grandpa: fix test compilation

* grandpa: remove afg_log macro mod
This commit is contained in:
André Silva
2020-04-07 21:11:22 +01:00
committed by GitHub
parent 6a87e1d1af
commit 1a9c0fee30
6 changed files with 147 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/babe/src/lib.rs
+22 -18
View File
@@ -101,7 +101,7 @@ use sc_client_api::{
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use futures::prelude::*;
use log::{warn, debug, info, trace};
use log::{debug, info, log, trace, warn};
use sc_consensus_slots::{
SlotWorker, SlotInfo, SlotCompatible, StorageChanges, CheckedHeader, check_equivocation,
};
@@ -222,16 +222,6 @@ fn babe_err<B: BlockT>(error: Error<B>) -> Error<B> {
error
}
macro_rules! babe_info {
($($i: expr),+) => {
{
info!(target: "babe", $($i),+);
format!($($i),+)
}
};
}
/// Intermediate value passed to block importer.
pub struct BabeIntermediate<B: BlockT> {
/// The epoch descriptor.
@@ -368,7 +358,7 @@ pub fn start_babe<B, C, SC, E, I, SO, CAW, Error>(BabeParams {
&inherent_data_providers,
)?;
babe_info!("👶 Starting BABE Authorship worker");
info!(target: "babe", "👶 Starting BABE Authorship worker");
Ok(sc_consensus_slots::start_slot_worker(
config.0,
select_chain,
@@ -1010,15 +1000,29 @@ impl<Block, Client, Inner> BlockImport<Block> for BabeBlockImport<Block, Client,
ConsensusError::ClientImport(Error::<Block>::FetchEpoch(parent_hash).into())
})?;
babe_info!("👶 New epoch {} launching at block {} (block slot {} >= start slot {}).",
viable_epoch.as_ref().epoch_index,
hash,
slot_number,
viable_epoch.as_ref().start_slot);
// restrict info logging during initial sync to avoid spam
let log_level = if block.origin == BlockOrigin::NetworkInitialSync {
log::Level::Debug
} else {
log::Level::Info
};
log!(target: "babe",
log_level,
"👶 New epoch {} launching at block {} (block slot {} >= start slot {}).",
viable_epoch.as_ref().epoch_index,
hash,
slot_number,
viable_epoch.as_ref().start_slot,
);
let next_epoch = viable_epoch.increment(next_epoch_descriptor);
babe_info!("👶 Next epoch starts at slot {}", next_epoch.as_ref().start_slot);
log!(target: "babe",
log_level,
"👶 Next epoch starts at slot {}",
next_epoch.as_ref().start_slot,
);
// prune the tree of epochs not part of the finalized chain or
// that are not live anymore, and then track the given epoch change