clean up replay output

This commit is contained in:
Ethan Buchman 2016-01-10 16:56:52 -05:00
parent 56076d4d0e
commit bc2a721a0a
1 changed files with 20 additions and 1 deletions

View File

@ -271,9 +271,11 @@ func (pb *playback) readReplayMessage() error {
if err != nil { if err != nil {
return fmt.Errorf("Error reading json data: %v", err) return fmt.Errorf("Error reading json data: %v", err)
} }
log.Notice("Replaying message", "type", reflect.TypeOf(msg.Msg), "msg", msg.Msg)
// for logging
switch m := msg.Msg.(type) { switch m := msg.Msg.(type) {
case *types.EventDataRoundState: case *types.EventDataRoundState:
log.Notice("New Step", "height", m.Height, "round", m.Round, "step", m.Step)
// these are playback checks // these are playback checks
ticker := time.After(time.Second * 2) ticker := time.After(time.Second * 2)
select { select {
@ -286,6 +288,22 @@ func (pb *playback) readReplayMessage() error {
return fmt.Errorf("Failed to read off newStepCh") return fmt.Errorf("Failed to read off newStepCh")
} }
case msgInfo: case msgInfo:
peerKey := m.PeerKey
if peerKey == "" {
peerKey = "local"
}
switch msg := m.Msg.(type) {
case *ProposalMessage:
p := msg.Proposal
log.Notice("Proposal", "height", p.Height, "round", p.Round, "header",
p.BlockPartsHeader, "pol", p.POLRound, "peer", peerKey)
case *BlockPartMessage:
log.Notice("BlockPart", "height", msg.Height, "round", msg.Round, "peer", peerKey)
case *VoteMessage:
v := msg.Vote
log.Notice("Vote", "height", v.Height, "round", v.Round, "type", v.Type,
"hash", v.BlockHash, "header", v.BlockPartsHeader, "peer", peerKey)
}
// internal or from peer // internal or from peer
if m.PeerKey == "" { if m.PeerKey == "" {
pb.cs.internalMsgQueue <- m pb.cs.internalMsgQueue <- m
@ -293,6 +311,7 @@ func (pb *playback) readReplayMessage() error {
pb.cs.peerMsgQueue <- m pb.cs.peerMsgQueue <- m
} }
case timeoutInfo: case timeoutInfo:
log.Notice("Timeout", "height", m.Height, "round", m.Round, "step", m.Step, "dur", m.Duration)
pb.cs.tockChan <- m pb.cs.tockChan <- m
default: default:
return fmt.Errorf("Unknown ConsensusLogMessage type: %v", reflect.TypeOf(msg.Msg)) return fmt.Errorf("Unknown ConsensusLogMessage type: %v", reflect.TypeOf(msg.Msg))