forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: error logging changed

Browse source
This commit is contained in:
Vlad 2017-12-20 15:39:09 +02:00
parent b7ecc495c3
commit b044e9a0aa
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
whisper/whisperv6/whisper.go
View file

@ -521,20 +521,19 @@ func (wh *Whisper) runMessageLoop(p *Peer, rw p2p.MsgReadWriter) error {
return errors.New("invalid envelopes")
}
var trouble error
trouble := false
for _, env := range envelopes {
cached, err := wh.add(env)
if err != nil && trouble == nil {
// only report the first occurring error
trouble = err
if err != nil {
trouble = true
log.Error("bad envelope received, peer will be disconnected", "peer", p.peer.ID(), "err", err)
}
if cached {
p.mark(env)
}
}
if trouble != nil {
log.Warn("bad envelope received, peer will be disconnected", "peer", p.peer.ID(), "err", trouble)
if trouble {
return errors.New("invalid envelope")
}
case p2pCode: