roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #3390 from bas-vk/statsd-stop

Browse Source 
ethstats: check if received event is valid
This commit is contained in:
Péter Szilágyi 2016-12-01 10:30:19 +02:00 committed by GitHub
commit 717d2f6f9e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ethstats/ethstats.go
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 {