LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Merge pull request #537 from cfromknecht/dont-print-rawtx-garbage

Browse source 
chain/bitcoind_conn: only print ASCII rawtx event types
This commit is contained in:
Olaoluwa Osuntokun 2018-09-03 17:55:49 -07:00 committed by GitHub
commit 0059b9fcd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chain/bitcoind_conn.go
View file

@ -191,7 +191,8 @@ func (c *BitcoindConn) blockEventHandler(conn *gozmq.Conn) {
continue
}
log.Errorf("Unable to receive ZMQ message: %v", err)
log.Errorf("Unable to receive ZMQ rawblock message: %v",
err)
continue
}
@ -225,7 +226,7 @@ func (c *BitcoindConn) blockEventHandler(conn *gozmq.Conn) {
// bitcoind shuts down, which will produce an unreadable
// event type. To prevent from logging it, we'll make
// sure it conforms to the ASCII standard.
if !isASCII(eventType) {
if eventType == "" || !isASCII(eventType) {
continue
}
@ -266,7 +267,8 @@ func (c *BitcoindConn) txEventHandler(conn *gozmq.Conn) {
continue
}
log.Errorf("Unable to receive ZMQ message: %v", err)
log.Errorf("Unable to receive ZMQ rawtx message: %v",
err)
continue
}
@ -296,6 +298,14 @@ func (c *BitcoindConn) txEventHandler(conn *gozmq.Conn) {
}
c.rescanClientsMtx.Unlock()
default:
// It's possible that the message wasn't fully read if
// bitcoind shuts down, which will produce an unreadable
// event type. To prevent from logging it, we'll make
// sure it conforms to the ASCII standard.
if eventType == "" || !isASCII(eventType) {
continue
}
log.Warnf("Received unexpected event type from rawtx "+
"subscription: %v", eventType)
}