mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-01-19 05:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5676 from ErikEk/chainnotifier-remove-error-log

Browse Source 
chainnotifier: remove error logs
This commit is contained in:
Olaoluwa Osuntokun 2021-08-30 18:35:12 -07:00 committed by GitHub
commit 844874252f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/release-notes/release-notes-0.14.0.md
View File

@ -169,6 +169,8 @@ you.
* [Link channel point logging](https://github.com/lightningnetwork/lnd/pull/5508)
* [Canceling the chain notifier no longer logs certain errors](https://github.com/lightningnetwork/lnd/pull/5676)
* [Fixed context leak in integration tests, and properly handled context
timeout](https://github.com/lightningnetwork/lnd/pull/5646).

23
lnrpc/chainrpc/chainnotifier_server.go
View File

@ -300,7 +300,7 @@ func (s *Server) RegisterConfirmationsNtfn(in *ConfRequest,
}
// The transaction satisfying the request has been reorged out
// of the chain, so we'll send an event describing so.
// of the chain, so we'll send an event describing it.
case _, ok := <-confEvent.NegativeConf:
if !ok {
return chainntnfs.ErrChainNotifierShuttingDown
@ -324,9 +324,12 @@ func (s *Server) RegisterConfirmationsNtfn(in *ConfRequest,
return nil
// The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context
// itself to the caller.
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-confStream.Context().Done():
if errors.Is(confStream.Context().Err(), context.Canceled) {
return nil
}
return confStream.Context().Err()
// The server has been requested to shut down.
@ -432,9 +435,12 @@ func (s *Server) RegisterSpendNtfn(in *SpendRequest,
return nil
// The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context
// itself to the caller.
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-spendStream.Context().Done():
if errors.Is(spendStream.Context().Err(), context.Canceled) {
return nil
}
return spendStream.Context().Err()
// The server has been requested to shut down.
@ -503,9 +509,12 @@ func (s *Server) RegisterBlockEpochNtfn(in *BlockEpoch,
}
// The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context
// itself to the caller.
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-epochStream.Context().Done():
if errors.Is(epochStream.Context().Err(), context.Canceled) {
return nil
}
return epochStream.Context().Err()
// The server has been requested to shut down.