RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend error logging in socketio onSubscribe

Browse Source
This commit is contained in:
Martin Boehm 2018-05-29 19:48:01 +02:00
parent 01aa3d9074
commit 00686089d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/socketio.go
View File

@ -809,8 +809,8 @@ func (s *SocketIoServer) getMempoolEntry(txid string) (res resultGetMempoolEntry
// "bitcoind/hashblock" // "bitcoind/hashblock"
// "bitcoind/addresstxid",["2MzTmvPJLZaLzD9XdN3jMtQA5NexC3rAPww","2NAZRJKr63tSdcTxTN3WaE9ZNDyXy6PgGuv"] // "bitcoind/addresstxid",["2MzTmvPJLZaLzD9XdN3jMtQA5NexC3rAPww","2NAZRJKr63tSdcTxTN3WaE9ZNDyXy6PgGuv"]
func (s *SocketIoServer) onSubscribe(c *gosocketio.Channel, req []byte) interface{} { func (s *SocketIoServer) onSubscribe(c *gosocketio.Channel, req []byte) interface{} {
onError := func(id, sc, err string) { onError := func(id, sc, err, detail string) {
glog.Error(id, " onSubscribe ", sc, ": ", err) glog.Error(id, " onSubscribe ", err, ": ", err)
s.metrics.SocketIOSubscribes.With(common.Labels{"channel": sc, "status": err}).Inc() s.metrics.SocketIOSubscribes.With(common.Labels{"channel": sc, "status": err}).Inc()
} }
@ -822,12 +822,12 @@ func (s *SocketIoServer) onSubscribe(c *gosocketio.Channel, req []byte) interfac
var addrs []string var addrs []string
sc = r[1:i] sc = r[1:i]
if sc != "bitcoind/addresstxid" { if sc != "bitcoind/addresstxid" {
onError(c.Id(), sc, "invalid data") onError(c.Id(), sc, "invalid data", "expecting bitcoind/addresstxid, req: "+r)
return nil return nil
} }
err := json.Unmarshal([]byte(r[i+2:]), &addrs) err := json.Unmarshal([]byte(r[i+2:]), &addrs)
if err != nil { if err != nil {
onError(c.Id(), sc, err.Error()) onError(c.Id(), sc, "invalid data", err.Error()+", req: "+r)
return nil return nil
} }
for _, a := range addrs { for _, a := range addrs {
@ -836,7 +836,7 @@ func (s *SocketIoServer) onSubscribe(c *gosocketio.Channel, req []byte) interfac
} else { } else {
sc = r[1 : len(r)-1] sc = r[1 : len(r)-1]
if sc != "bitcoind/hashblock" { if sc != "bitcoind/hashblock" {
onError(c.Id(), sc, "invalid data") onError(c.Id(), sc, "invalid data", "expecting bitcoind/hashblock, req: "+r)
return nil return nil
} }
c.Join(sc) c.Join(sc)