Merge pull request nervosnetwork#324 from zhangsoledad/zhangsoledad/s…

…ync_log refactor: improve sync log format
zhangsoledad · Mar 13, 2019 · 43a9ad7 · 43a9ad7
2 parents fb69ea1 + 657c2e5
commit 43a9ad7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/sync/src/synchronizer/block_fetcher.rs b/sync/src/synchronizer/block_fetcher.rs
@@ -193,7 +193,7 @@ where
                     && inflight.insert(to_fetch_hash.clone().clone())
                 {
                     debug!(
-                        target: "sync", "[Synchronizer] inflight insert {:?}------------{:?}",
+                        target: "sync", "[Synchronizer] inflight insert {:?}------------{:x}",
                         to_fetch.number(),
                         to_fetch_hash
                     );

diff --git a/sync/src/synchronizer/block_process.rs b/sync/src/synchronizer/block_process.rs
@@ -30,7 +30,7 @@ where
 
     pub fn execute(self) {
         let block: Block = (*self.message).into();
-        debug!(target: "sync", "BlockProcess received block {} {:?}", block.header().number(), block.header().hash());
+        debug!(target: "sync", "BlockProcess received block {} {:x}", block.header().number(), block.header().hash());
 
         self.synchronizer.peers.block_received(self.peer, &block);
         self.synchronizer.process_new_block(self.peer, block);

diff --git a/sync/src/synchronizer/get_blocks_process.rs b/sync/src/synchronizer/get_blocks_process.rs
@@ -33,9 +33,9 @@ where
     pub fn execute(self) {
         self.message.block_hashes().unwrap().iter().for_each(|fbs_h256| {
             let block_hash = fbs_h256.into();
-            debug!(target: "sync", "get_blocks {:?}", block_hash);
+            debug!(target: "sync", "get_blocks {:x}", block_hash);
             if let Some(block) = self.synchronizer.get_block(&block_hash) {
-                debug!(target: "sync", "respond_block {} {:?}", block.header().number(), block.header().hash());
+                debug!(target: "sync", "respond_block {} {:x}", block.header().number(), block.header().hash());
                 if let Some(filter) = self.synchronizer.peers.transaction_filters.read().get(&self.peer) {
                     let transactions_index = block.commit_transactions().iter().enumerate().filter(|(_index, tx)|
                         filter.contains(tx)

diff --git a/sync/src/synchronizer/get_headers_process.rs b/sync/src/synchronizer/get_headers_process.rs
@@ -69,7 +69,7 @@ where
                 fbb.finish(message, None);
                 let _ = self.nc.send(self.peer, fbb.finished_data().to_vec());
             } else {
-                warn!(target: "sync", "\n\nunknown block headers from peer {} {:?}\n\n", self.peer, block_locator_hashes);
+                warn!(target: "sync", "\n\nunknown block headers from peer {} {:#?}\n\n", self.peer, block_locator_hashes);
                 // Got 'headers' message without known blocks
                 // ban or close peers
                 self.nc

diff --git a/sync/src/synchronizer/headers_process.rs b/sync/src/synchronizer/headers_process.rs
@@ -271,7 +271,7 @@ where
                 target: "sync",
                 concat!(
                     "\n\nchain total_difficulty = {}; number={}\n",
-                    "number={}; best_known_header = {}; total_difficulty = {};\n",
+                    "number={}; best_known_header = {:x}; total_difficulty = {};\n",
                     "peers={} number={:?}; best_known_header = {:?}; total_difficulty = {:?}\n",
                 ),
                 chain_state.total_difficulty(),
@@ -281,8 +281,8 @@ where
                 own.total_difficulty(),
                 self.peer,
                 peer_state.as_ref().map(|state| state.number()),
-                peer_state.as_ref().map(|state| state.hash()),
-                peer_state.as_ref().map(|state| state.total_difficulty()),
+                peer_state.as_ref().map(|state| format!("{:x}", state.hash())),
+                peer_state.as_ref().map(|state| format!("{}", state.total_difficulty())),
             );
         }
 

diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs
@@ -462,7 +462,7 @@ impl<CI: ChainIndex> Synchronizer<CI> {
                         }
                     } else {
                         debug!(
-                            target: "sync", "[Synchronizer] insert_orphan_block {:?}------------{:?}",
+                            target: "sync", "[Synchronizer] insert_orphan_block {:?}------------{:x}",
                             block.header().number(),
                             block.header().hash()
                         );
@@ -478,7 +478,7 @@ impl<CI: ChainIndex> Synchronizer<CI> {
             }
         } else {
             debug!(
-                target: "sync", "[Synchronizer] insert_orphan_block {:?}------------{:?}",
+                target: "sync", "[Synchronizer] insert_orphan_block {:?}------------{:x}",
                 block.header().number(),
                 block.header().hash()
             );

diff --git a/sync/src/types.rs b/sync/src/types.rs
@@ -174,7 +174,7 @@ impl Peers {
 
     pub fn block_received(&self, peer: PeerIndex, block: &Block) {
         let mut blocks_inflight = self.blocks_inflight.write();
-        debug!(target: "sync", "block_received from peer {} {} {:?}", peer, block.header().number(), block.header().hash());
+        debug!(target: "sync", "block_received from peer {} {} {:x}", peer, block.header().number(), block.header().hash());
         blocks_inflight.entry(peer).and_modify(|inflight| {
             inflight.remove(&block.header().hash());
             inflight.update_timestamp();