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

ethstats: avoid blocking chan when received invalid stats request (#21073)

Browse Source 
* ethstats: avoid blocking chan when received invalid stats request

* ethstats: minor code polishes

Co-authored-by: Péter Szilágyi <peterke@gmail.com>
This commit is contained in:
Hao Duan 2020-05-26 18:09:00 +08:00 committed by GitHub
parent 7ddb40239b
commit 81e9caed7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethstats/ethstats.go
View File

@ -320,8 +320,11 @@ func (s *Service) readLoop(conn *websocket.Conn) {
request, ok := msg["emit"][1].(map[string]interface{}) request, ok := msg["emit"][1].(map[string]interface{})
if !ok { if !ok {
log.Warn("Invalid stats history request", "msg", msg["emit"][1]) log.Warn("Invalid stats history request", "msg", msg["emit"][1])
s.histCh <- nil select {
continue // Ethstats sometime sends invalid history requests, ignore those case s.histCh <- nil: // Treat it as an no indexes request
default:
}
continue
} }
list, ok := request["list"].([]interface{}) list, ok := request["list"].([]interface{})
if !ok { if !ok {
@ -349,7 +352,7 @@ func (s *Service) readLoop(conn *websocket.Conn) {
} }
} }
// nodeInfo is the collection of metainformation about a node that is displayed // nodeInfo is the collection of meta information about a node that is displayed
// on the monitoring page. // on the monitoring page.
type nodeInfo struct { type nodeInfo struct {
Name string `json:"name"` Name string `json:"name"`