From a49f6852eb876c89e480bcfdc9c6d0310863b46a Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 13 May 2021 02:50:04 +0000 Subject: [PATCH 1/2] fix: Stop looping retries after dial failure --- wsnet/listen.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wsnet/listen.go b/wsnet/listen.go index 859ba17f..a9d23327 100644 --- a/wsnet/listen.go +++ b/wsnet/listen.go @@ -49,6 +49,9 @@ func Listen(ctx context.Context, broker string) (io.Closer, error) { case <-ctx.Done(): err = ctx.Err() } + if err == nil { + break + } if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { break } From 889d9396e7872fac0c4ace41c6d5c62abc5ab915 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 12 May 2021 21:54:47 -0500 Subject: [PATCH 2/2] Merge if statements Co-authored-by: Dean Sheather --- wsnet/listen.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wsnet/listen.go b/wsnet/listen.go index a9d23327..c11df79c 100644 --- a/wsnet/listen.go +++ b/wsnet/listen.go @@ -49,10 +49,7 @@ func Listen(ctx context.Context, broker string) (io.Closer, error) { case <-ctx.Done(): err = ctx.Err() } - if err == nil { - break - } - if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { + if err == nil || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) { break } }