ethstats: check if received event is valid

This commit is contained in:
Bas van Kervel 2016-11-30 17:47:39 +01:00
parent 86f9e836be
commit 56b446190a

View File

@ -145,13 +145,21 @@ func (s *Service) loop() {
glog.V(logger.Warn).Infof("Full stats report failed: %v", err) glog.V(logger.Warn).Infof("Full stats report failed: %v", err)
} }
case head := <-headSub.Chan(): case head := <-headSub.Chan():
if head == nil { // node stopped
conn.Close()
return
}
if err = s.reportBlock(out, head.Data.(core.ChainHeadEvent).Block); err != nil { if err = s.reportBlock(out, head.Data.(core.ChainHeadEvent).Block); err != nil {
glog.V(logger.Warn).Infof("Block stats report failed: %v", err) glog.V(logger.Warn).Infof("Block stats report failed: %v", err)
} }
if err = s.reportPending(out); err != nil { if err = s.reportPending(out); err != nil {
glog.V(logger.Warn).Infof("Post-block transaction stats report failed: %v", err) glog.V(logger.Warn).Infof("Post-block transaction stats report failed: %v", err)
} }
case <-txSub.Chan(): case ev := <-txSub.Chan():
if ev == nil { // node stopped
conn.Close()
return
}
// Exhaust events to avoid reporting too frequently // Exhaust events to avoid reporting too frequently
for exhausted := false; !exhausted; { for exhausted := false; !exhausted; {
select { select {