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

Merge pull request #5695 from ErikEk/lncli-remove-error-log

Browse source 
lncli: remove error logs
This commit is contained in:
Olaoluwa Osuntokun 2021-09-10 16:50:34 -07:00 • committed by GitHub
commit 27b416935e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/release-notes/release-notes-0.14.0.md
View file

@ -179,6 +179,9 @@ you.
* [Fixed timeout flakes in async payment benchmark tests](https://github.com/lightningnetwork/lnd/pull/5579).
* [State, subscribechannelevents, subscribepeerevents, subscribeinvoices, subscribetransactions,
subscribechannelgraph and subscribechannelbackups no longer logs certain errors](https://github.com/lightningnetwork/lnd/pull/5695).
* [Flake fix in async bidirectional payment test](https://github.com/lightningnetwork/lnd/pull/5607).
* [Fixed context timeout when closing channels in tests](https://github.com/lightningnetwork/lnd/pull/5616).

7
rpcperms/interceptor.go
View file

@ -2,6 +2,7 @@ package rpcperms
import (
"context"
"errors"
"fmt"
"sync"
@ -272,7 +273,13 @@ func (r *InterceptorChain) SubscribeState(req *lnrpc.SubscribeStateRequest,
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-stream.Context().Done():
if errors.Is(stream.Context().Err(), context.Canceled) {
return nil
}
return stream.Context().Err()
case <-r.quit:

40
rpcserver.go
View file

@ -2920,7 +2920,13 @@ func (r *rpcServer) SubscribePeerEvents(req *lnrpc.PeerEventSubscription,
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-eventStream.Context().Done():
if errors.Is(eventStream.Context().Err(), context.Canceled) {
return nil
}
return eventStream.Context().Err()
case <-r.quit:
@ -4210,7 +4216,13 @@ func (r *rpcServer) SubscribeChannelEvents(req *lnrpc.ChannelEventSubscription,
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-updateStream.Context().Done():
if errors.Is(updateStream.Context().Err(), context.Canceled) {
return nil
}
return updateStream.Context().Err()
case <-r.quit:
@ -5158,7 +5170,13 @@ func (r *rpcServer) SubscribeInvoices(req *lnrpc.InvoiceSubscription,
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-updateStream.Context().Done():
if errors.Is(updateStream.Context().Err(), context.Canceled) {
return nil
}
return updateStream.Context().Err()
case <-r.quit:
@ -5219,8 +5237,14 @@ func (r *rpcServer) SubscribeTransactions(req *lnrpc.GetTransactionsRequest,
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-updateStream.Context().Done():
rpcsLog.Infof("Cancelling transaction subscription")
rpcsLog.Infof("Canceling transaction subscription")
if errors.Is(updateStream.Context().Err(), context.Canceled) {
return nil
}
return updateStream.Context().Err()
case <-r.quit:
@ -5761,9 +5785,13 @@ func (r *rpcServer) SubscribeChannelGraph(req *lnrpc.GraphTopologySubscription,
return err
}
// The context was cancelled so we report a cancellation error
// and exit immediately.
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline
// we will return an error.
case <-updateStream.Context().Done():
if errors.Is(updateStream.Context().Err(), context.Canceled) {
return nil
}
return updateStream.Context().Err()
// The server is quitting, so we'll exit immediately. Returning
@ -6688,7 +6716,13 @@ func (r *rpcServer) SubscribeChannelBackups(req *lnrpc.ChannelBackupSubscription
return err
}
// The response stream's context for whatever reason has been
// closed. If context is closed by an exceeded deadline we will
// return an error.
case <-updateStream.Context().Done():
if errors.Is(updateStream.Context().Err(), context.Canceled) {
return nil
}
return updateStream.Context().Err()
case <-r.quit: