Merge branch 'master' into set_target_height

dustinxie · web-flow · commit c6ea96ae1e16 · 2021-09-23T11:45:03.000-07:00
diff --git a/blocksync/blocksync.go b/blocksync/blocksync.go
@@ -120,7 +120,7 @@ func (bs *blockSyncer) commitBlocks(blks []*peerBlock) bool {
 		}
 		bs.peerBlockList.Store(blk.pid, true)
 
-		log.L().Debug("failed to commit block", zap.Error(err))
+		log.L().Error("failed to commit block", zap.Error(err), zap.Uint64("height", blk.block.Height()), zap.String("peer", blk.pid))
 	}
 	return false
 }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (bs blockSyncer) commitBlocks(blks []peerBlock) bool {`
`120`	`120`	`}`
`121`	`121`	`bs.peerBlockList.Store(blk.pid, true)`
`122`	`122`
`123`		`- log.L().Debug("failed to commit block", zap.Error(err))`
	`123`	`+ log.L().Error("failed to commit block", zap.Error(err), zap.Uint64("height", blk.block.Height()), zap.String("peer", blk.pid))`
`124`	`124`	`}`
`125`	`125`	`return false`
`126`	`126`	`}`