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

chain: handle ZMQ timeout error correctly

Browse source
This commit is contained in:
Wilmer Paulino 2018-08-15 17:22:32 -07:00
parent 5fb94231d0
commit 5f7060dadf
No known key found for this signature in database
GPG key ID: 6DF57B9F9514972F
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
chain/bitcoind_conn.go
View file

@ -168,7 +168,7 @@ func (c *BitcoindConn) blockEventHandler(conn *gozmq.Conn) {
defer c.wg.Done()
defer conn.Close()
log.Info("Started listening for bitcoind block notifications via ZMQ ",
log.Info("Started listening for bitcoind block notifications via ZMQ "+
"on", c.zmqBlockHost)
for {
@ -180,16 +180,18 @@ func (c *BitcoindConn) blockEventHandler(conn *gozmq.Conn) {
default:
}
// Poll an event from the ZMQ socket. It's possible that the
// connection to the socket continuously times out, so we'll
// prevent logging this error to prevent spamming the logs.
// Poll an event from the ZMQ socket.
msgBytes, err := conn.Receive()
if err != nil {
err, ok := err.(net.Error)
if !ok || !err.Timeout() {
log.Error(err)
// It's possible that the connection to the socket
// continuously times out, so we'll prevent logging this
// error to prevent spamming the logs.
netErr, ok := err.(net.Error)
if ok && netErr.Timeout() {
continue
}
log.Errorf("Unable to receive ZMQ message: %v", err)
continue
}
@ -234,7 +236,7 @@ func (c *BitcoindConn) txEventHandler(conn *gozmq.Conn) {
defer conn.Close()
log.Info("Started listening for bitcoind transaction notifications "+
"via ZMQ on ", c.zmqTxHost)
"via ZMQ on", c.zmqTxHost)
for {
// Before attempting to read from the ZMQ socket, we'll make
@ -245,16 +247,18 @@ func (c *BitcoindConn) txEventHandler(conn *gozmq.Conn) {
default:
}
// Poll an event from the ZMQ socket. It's possible that the
// connection to the socket continuously times out, so we'll
// prevent logging this error to prevent spamming the logs.
// Poll an event from the ZMQ socket.
msgBytes, err := conn.Receive()
if err != nil {
err, ok := err.(net.Error)
if !ok || !err.Timeout() {
log.Error(err)
// It's possible that the connection to the socket
// continuously times out, so we'll prevent logging this
// error to prevent spamming the logs.
netErr, ok := err.(net.Error)
if ok && netErr.Timeout() {
continue
}
log.Errorf("Unable to receive ZMQ message: %v", err)
continue
}