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

server: within peerTerminationWatcher exit early if daemon is exiting

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-07-30 14:21:49 -07:00
parent cd7b3290a8
commit 34bb0ec36f
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.go
View File

@ -336,8 +336,8 @@ func (s *server) Start() error {
s.wg.Add(1) s.wg.Add(1)
go s.queryHandler() go s.queryHandler()
// With all the relevant sub-systems started, we'll now atetmpt to // With all the relevant sub-systems started, we'll now attempt to
// stasblish persistent connections to our direct channel collaborators // establish persistent connections to our direct channel collaborators
// within the network. // within the network.
if err := s.establishPersistentConnections(); err != nil { if err := s.establishPersistentConnections(); err != nil {
return err return err
@ -610,9 +610,21 @@ func (s *server) peerTerminationWatcher(p *peer) {
srvrLog.Debugf("Peer %v has been disconnected", p) srvrLog.Debugf("Peer %v has been disconnected", p)
// If the server is exiting then we can bail out early ourselves as all
// the other sub-systems will already be shutting down.
select {
case <-s.quit:
return
default:
// If we aren't shutting down, then we'll fall through this
// this empty default case.
}
// Tell the switch to remove all links associated with this peer. // Tell the switch to remove all links associated with this peer.
// Passing nil as the target link indicates that all links associated // Passing nil as the target link indicates that all links associated
// with this interface should be closed. // with this interface should be closed.
//
// TODO(roasbeef): instead add a PurgeInterfaceLinks function?
links, err := p.server.htlcSwitch.GetLinksByInterface(p.pubKeyBytes) links, err := p.server.htlcSwitch.GetLinksByInterface(p.pubKeyBytes)
if err != nil { if err != nil {
srvrLog.Errorf("unable to get channel links: %v", err) srvrLog.Errorf("unable to get channel links: %v", err)