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

chainntnfs: exit notifyBlockEpochs upon shutdown

Browse Source 
On restarts, notifyBlockEpochs would intermittently attempt to send new
block epoch notifications to clients that had already been shut down,
causing a “send on closed channel” error. This change exits
notifyBlockEpochs upon shutdown so as to prevent this.
This commit is contained in:
bryanvu 2017-01-05 13:35:44 -08:00 committed by Olaoluwa Osuntokun
parent 24a99ade66
commit 35cf21733d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chainntnfs/btcdnotify/btcd.go
View File

@ -282,6 +282,7 @@ out:
chainntnfs.Log.Infof("New block: height=%v, sha=%v", chainntnfs.Log.Infof("New block: height=%v, sha=%v",
update.blockHeight, update.blockHash) update.blockHeight, update.blockHash)
b.wg.Add(1)
go b.notifyBlockEpochs(update.blockHeight, go b.notifyBlockEpochs(update.blockHeight,
update.blockHash) update.blockHash)
@ -428,6 +429,8 @@ func (b *BtcdNotifier) attemptHistoricalDispatch(msg *confirmationsNotification,
// notifyBlockEpochs notifies all registered block epoch clients of the newly // notifyBlockEpochs notifies all registered block epoch clients of the newly
// connected block to the main chain. // connected block to the main chain.
func (b *BtcdNotifier) notifyBlockEpochs(newHeight int32, newSha *chainhash.Hash) { func (b *BtcdNotifier) notifyBlockEpochs(newHeight int32, newSha *chainhash.Hash) {
defer b.wg.Done()
epoch := &chainntnfs.BlockEpoch{ epoch := &chainntnfs.BlockEpoch{
Height: newHeight, Height: newHeight,
Hash: newSha, Hash: newSha,
@ -439,6 +442,8 @@ func (b *BtcdNotifier) notifyBlockEpochs(newHeight int32, newSha *chainhash.Hash
// full, then we no-op and move onto the next client. // full, then we no-op and move onto the next client.
select { select {
case epochChan <- epoch: case epochChan <- epoch:
case <-b.quit:
return
default: default:
} }
} }