From 1adeb41a9d67801d79302a94119b2fbf60da51fd Mon Sep 17 00:00:00 2001 From: whythat Date: Sat, 18 Jul 2020 23:41:11 +0300 Subject: [PATCH] rpcserver+lnrpc: make Subscribe RPCs context aware This commit makes all the Subscribe RCP's context aware so that they stop executing when the request context is cancelled. --- lnrpc/invoicesrpc/invoices_server.go | 3 +++ lntest/itest/log_error_whitelist.txt | 4 ++++ rpcserver.go | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/lnrpc/invoicesrpc/invoices_server.go b/lnrpc/invoicesrpc/invoices_server.go index 2fa881db..0c76b1d7 100644 --- a/lnrpc/invoicesrpc/invoices_server.go +++ b/lnrpc/invoicesrpc/invoices_server.go @@ -253,6 +253,9 @@ func (s *Server) SubscribeSingleInvoice(req *SubscribeSingleInvoiceRequest, return nil } + case <-updateStream.Context().Done(): + return updateStream.Context().Err() + case <-s.quit: return nil } diff --git a/lntest/itest/log_error_whitelist.txt b/lntest/itest/log_error_whitelist.txt index 89dd0f35..08b3419f 100644 --- a/lntest/itest/log_error_whitelist.txt +++ b/lntest/itest/log_error_whitelist.txt @@ -269,3 +269,7 @@