diff options
author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-06 04:32:41 +0800 |
---|---|---|
committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-06 04:32:41 +0800 |
commit | 94e543bc398efbb5c712b6e4cb48d8a57eb3400d (patch) | |
tree | 39a88885789b52d1d5addf8e28d859e55aeeeb52 /core | |
parent | f01d745d70ceb724d015a5d7fcd9516168286b78 (diff) | |
parent | 5948adfa10e9ba1069974839140b594ba902cce2 (diff) | |
download | dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar.gz dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar.bz2 dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar.lz dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar.xz dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.tar.zst dexon-94e543bc398efbb5c712b6e4cb48d8a57eb3400d.zip |
Merge pull request #431 from tgerring/jsonlogs
Structured logging updates
Diffstat (limited to 'core')
-rw-r--r-- | core/chain_manager.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 959bfd398..81f085c47 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -15,6 +15,7 @@ import ( ) var chainlogger = logger.NewLogger("CHAIN") +var jsonlogger = logger.NewJsonLogger() type ChainEvent struct { Block *types.Block @@ -122,7 +123,7 @@ func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlo self.mu.RLock() defer self.mu.RUnlock() - return self.td, self.currentBlock.Hash(), self.Genesis().Hash() + return self.td, self.currentBlock.Hash(), self.genesisBlock.Hash() } func (self *ChainManager) SetProcessor(proc types.BlockProcessor) { @@ -395,11 +396,11 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { var canonical, split bool self.mu.Lock() + cblock := self.currentBlock { // Write block to database. Eventually we'll have to improve on this and throw away blocks that are // not in the canonical chain. self.write(block) - cblock := self.currentBlock // Compare the TD of the last known block in the canonical chain to make sure it's greater. // At this point it's possible that a different chain (fork) becomes the new canonical chain. if td.Cmp(self.td) > 0 { @@ -417,6 +418,12 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { self.mu.Unlock() if canonical { + jsonlogger.LogJson(&logger.EthChainNewHead{ + BlockHash: ethutil.Bytes2Hex(block.Hash()), + BlockNumber: block.Number(), + ChainHeadHash: ethutil.Bytes2Hex(cblock.Hash()), + BlockPrevHash: ethutil.Bytes2Hex(block.ParentHash()), + }) self.setTransState(state.New(block.Root(), self.db)) self.eventMux.Post(ChainEvent{block, td}) } |