From b77c068e3d9fd25ff35ef352537ddefe0e5f2cc4 Mon Sep 17 00:00:00 2001 From: Jesse de Wit Date: Tue, 3 Jan 2023 14:43:37 +0100 Subject: [PATCH] Remove unnecessarily complex go func --- cln_plugin/server.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/cln_plugin/server.go b/cln_plugin/server.go index e852dab..e0901a5 100644 --- a/cln_plugin/server.go +++ b/cln_plugin/server.go @@ -154,16 +154,6 @@ func (s *server) HtlcStream(stream proto.ClnPlugin_HtlcStreamServer) error { s.removeSubscriptionIfUnchanged(sb, nil) }() - go func() { - // If the context is done, there will be no more connection with the - // client. Listen for context done and clean up the subscriber. - // Cleaning up the subscriber will make the HtlcStream function exit. - // (sb.done or sb.err) - <-stream.Context().Done() - log.Printf("HtlcStream context is done. Removing subscriber: %v", stream.Context().Err()) - s.removeSubscriptionIfUnchanged(sb, stream.Context().Err()) - }() - select { case <-s.done: log.Printf("HTLC server signalled done. Return EOF.") @@ -174,6 +164,9 @@ func (s *server) HtlcStream(stream proto.ClnPlugin_HtlcStreamServer) error { case err := <-sb.err: log.Printf("HTLC stream signalled error. Return %v", err) return err + case <-stream.Context().Done(): + log.Printf("HtlcStream context is done. Return: %v", stream.Context().Err()) + return stream.Context().Err() } }