akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server: return error from sendPeerMessages

Browse Source 
This commit adds a return error to sendPeerMessages,
making it possible to observe if a message sent to
a peer fails or succeeds.
This commit is contained in:
Johan T. Halseth 2017-11-15 18:24:59 -08:00 committed by Olaoluwa Osuntokun
parent 25b77a0aee
commit 8a79bbf383
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server.go
View File

@ -950,15 +950,27 @@ func (s *server) sendToPeer(target *btcec.PublicKey,
return err return err
} }
s.sendPeerMessages(targetPeer, msgs, nil) // Send messages to the peer and return any error from
// sending a message.
errChans := s.sendPeerMessages(targetPeer, msgs, nil)
for _, errChan := range errChans {
select {
case err := <-errChan:
return err
case <-s.quit:
return ErrServerShuttingDown
}
}
return nil return nil
} }
// sendPeerMessages enqueues a list of messages into the outgoingQueue of the // sendPeerMessages enqueues a list of messages into the outgoingQueue of the
// `targetPeer`. This method supports additional broadcast-level // `targetPeer`. This method supports additional broadcast-level
// synchronization by using the additional `wg` to coordinate a particular // synchronization by using the additional `wg` to coordinate a particular
// broadcast. // broadcast. Since this method will wait for the return error from sending
// each message, it should be run as a goroutine (see comment below) and
// the error ignored if used for broadcasting messages, where the result
// from sending the messages is not of importance.
// //
// NOTE: This method must be invoked with a non-nil `wg` if it is spawned as a // NOTE: This method must be invoked with a non-nil `wg` if it is spawned as a
// go routine--both `wg` and the server's WaitGroup should be incremented // go routine--both `wg` and the server's WaitGroup should be incremented
@ -968,7 +980,7 @@ func (s *server) sendToPeer(target *btcec.PublicKey,
func (s *server) sendPeerMessages( func (s *server) sendPeerMessages(
targetPeer *peer, targetPeer *peer,
msgs []lnwire.Message, msgs []lnwire.Message,
wg *sync.WaitGroup) { wg *sync.WaitGroup) []chan error {
// If a WaitGroup is provided, we assume that this method was spawned // If a WaitGroup is provided, we assume that this method was spawned
// as a go routine, and that it is being tracked by both the server's // as a go routine, and that it is being tracked by both the server's
@ -981,9 +993,17 @@ func (s *server) sendPeerMessages(
defer wg.Done() defer wg.Done()
} }
// We queue each message, creating a slice of error channels that
// can be inspected after every message is successfully added to
// the queue.
var errChans []chan error
for _, msg := range msgs { for _, msg := range msgs {
targetPeer.queueMsg(msg, nil) errChan := make(chan error, 1)
targetPeer.queueMsg(msg, errChan)
errChans = append(errChans, errChan)
} }
return errChans
} }
// FindPeer will return the peer that corresponds to the passed in public key. // FindPeer will return the peer that corresponds to the passed in public key.