Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: wrap the log macros to fix ill formed macros #897

Merged
merged 9 commits into from
Jun 1, 2019
Merged

feat: wrap the log macros to fix ill formed macros #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bf2dc5
feat: wrap the log macros to fix ill formed macros
yangby-cryptape May 24, 2019
652aa20
chore: apply new log macros to chain
yangby-cryptape May 31, 2019
ea6f728
chore: apply new log macros to miner
yangby-cryptape May 31, 2019
571b7a9
chore: apply new log macros to network
yangby-cryptape May 31, 2019
ade371a
chore: apply new log macros to rpc & notify
yangby-cryptape May 31, 2019
958b2c3
chore: apply new log macros to verification & shared
yangby-cryptape May 31, 2019
ea1bcf1
chore: apply new log macros to util/* & ckb-bin
yangby-cryptape May 31, 2019
64304c0
chore: apply new log macros to sync & relay
yangby-cryptape May 31, 2019
dfc944a
chore: update the log filter template in configuration
yangby-cryptape May 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 29 additions & 30 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

[dependencies]
log = "0.4"
ckb-logger = { path = "../util/logger" }
ckb-core = { path = "../core" }
ckb-shared = { path = "../shared" }
ckb-chain-spec = { path = "../spec" }
Expand Down
49 changes: 27 additions & 22 deletions chain/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use ckb_core::extras::{BlockExt, DaoStats};
use ckb_core::service::{Request, DEFAULT_CHANNEL_SIZE, SIGNAL_CHANNEL_SIZE};
use ckb_core::transaction::{CellOutput, ProposalShortId};
use ckb_core::{BlockNumber, Cycle};
use ckb_logger::{self, debug, error, info, log_enabled, warn};
use ckb_notify::NotifyController;
use ckb_shared::cell_set::CellSetDiff;
use ckb_shared::chain_state::ChainState;
Expand All @@ -20,7 +21,6 @@ use dao::calculate_dao_data;
use failure::Error as FailureError;
use faketime::unix_time_as_millis;
use fnv::{FnvHashMap, FnvHashSet};
use log::{self, debug, error, info, log_enabled, warn};
use lru_cache::LruCache;
use numext_fixed_hash::H256;
use numext_fixed_uint::U256;
Expand Down Expand Up @@ -186,7 +186,7 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
let _ = responder.send(self.process_block(block, verify));
},
_ => {
error!(target: "chain", "process_block_receiver closed");
error!("process_block_receiver closed");
break;
},
}
Expand All @@ -208,20 +208,24 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
block: Arc<Block>,
need_verify: bool,
) -> Result<(), FailureError> {
debug!(target: "chain", "begin processing block: {:x}", block.header().hash());
debug!("begin processing block: {:x}", block.header().hash());
if block.header().number() < 1 {
warn!(target: "chain", "receive 0 number block: {}-{:x}", block.header().number(), block.header().hash());
warn!(
"receive 0 number block: {}-{:x}",
block.header().number(),
block.header().hash()
);
}
self.insert_block(block, need_verify)?;
debug!(target: "chain", "finish processing block");
debug!("finish processing block");
Ok(())
}

fn insert_block(&self, block: Arc<Block>, need_verify: bool) -> Result<(), FailureError> {
if need_verify {
let block_verifier = BlockVerifier::new(self.shared.clone());
block_verifier.verify(&block).map_err(|e| {
debug!(target: "chain", "[process_block] verification error {:?}", e);
debug!("[process_block] verification error {:?}", e);
e
})?
}
Expand Down Expand Up @@ -249,10 +253,8 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
let current_total_difficulty = chain_state.total_difficulty().to_owned();

debug!(
target: "chain",
"difficulty current = {:#x}, cannon = {:#x}",
current_total_difficulty,
cannon_total_difficulty,
current_total_difficulty, cannon_total_difficulty,
);

if parent_ext.txs_verified == Some(false) {
Expand Down Expand Up @@ -303,9 +305,9 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
&& (block.header().hash() < chain_state.tip_hash()))
{
debug!(
target: "chain",
"new best block found: {} => {:#x}, difficulty diff = {:#x}",
block.header().number(), block.header().hash(),
block.header().number(),
block.header().hash(),
&cannon_total_difficulty - &current_total_difficulty
);
self.find_fork(&mut fork, chain_state.tip_number(), &block, ext);
Expand Down Expand Up @@ -338,7 +340,6 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
if new_best_block {
let tip_header = block.header().to_owned();
info!(
target: "chain",
"block: {}, hash: {:#x}, total_diff: {:#x}, txs: {}",
tip_header.number(),
tip_header.hash(),
Expand All @@ -363,12 +364,11 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
self.notify
.notify_new_uncle(Arc::new(detached_block.clone()));
}
if log_enabled!(target: "chain", log::Level::Debug) {
if log_enabled!(ckb_logger::Level::Debug) {
self.print_chain(&chain_state, 10);
}
} else {
info!(
target: "chain",
"uncle: {}, hash: {:#x}, total_diff: {:#x}, txs: {}",
block.header().number(),
block.header().hash(),
Expand Down Expand Up @@ -590,7 +590,6 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
self.shared.consensus().pow_engine().proof_size();
if b.transactions().len() > 1 {
info!(
target: "chain",
"[block_verifier] block number: {}, hash: {:#x}, size:{}/{}, cycles: {}/{}",
b.header().number(),
b.header().hash(),
Expand All @@ -602,8 +601,11 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
}
}
Err(err) => {
error!(target: "chain", "cell_set_diff {}", serde_json::to_string(&cell_set_diff).unwrap());
error!(target: "chain", "block {}", serde_json::to_string(b).unwrap());
error!(
"cell_set_diff {}",
serde_json::to_string(&cell_set_diff).unwrap()
);
error!("block {}", serde_json::to_string(b).unwrap());
found_error =
Some(SharedError::InvalidTransaction(err.to_string()));
*verified = Some(false);
Expand All @@ -620,7 +622,10 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
}

if found_error.is_some() {
error!(target: "chain", "cell_set {}", serde_json::to_string(&chain_state.cell_set()).unwrap());
error!(
"cell_set {}",
serde_json::to_string(&chain_state.cell_set()).unwrap()
);
}
} else {
cell_set_diff.push_new(b);
Expand All @@ -641,7 +646,7 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
}

if let Some(err) = found_error {
error!(target: "chain", "fork {}", serde_json::to_string(&fork).unwrap());
error!("fork {}", serde_json::to_string(&fork).unwrap());
Err(err)?
} else {
Ok(cell_set_diff)
Expand All @@ -650,7 +655,7 @@ impl<CS: ChainStore + 'static> ChainService<CS> {

// TODO: beatify
fn print_chain(&self, chain_state: &ChainState<CS>, len: u64) {
debug!(target: "chain", "Chain {{");
debug!("Chain {{");

let tip = chain_state.tip_number();
let bottom = tip - cmp::min(tip, len);
Expand All @@ -659,9 +664,9 @@ impl<CS: ChainStore + 'static> ChainService<CS> {
let hash = self.shared.block_hash(number).unwrap_or_else(|| {
panic!(format!("invaild block number({}), tip={}", number, tip))
});
debug!(target: "chain", " {} => {:x}", number, hash);
debug!(" {} => {:x}", number, hash);
}

debug!(target: "chain", "}}");
debug!("}}");
}
}
Loading