Skip to content

Commit 61a3b89

Browse files
committed
req: handle values from closeds better.
(it may be closed when all is ok, so we shouldn't rely on yielding an actual value)
1 parent d61fdc4 commit 61a3b89

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

req.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,18 @@ func performReq(
367367
readevents:
368368
for {
369369
select {
370-
case ie, ok := <-results:
371-
if !ok {
370+
case ie, stillOpen := <-results:
371+
if !stillOpen {
372372
break readevents
373373
}
374374
stdout(ie.Event)
375-
case closed := <-closeds:
376-
if closed.HandledAuth {
377-
logverbose("%s CLOSED: %s\n", closed.Relay.URL, closed.Reason)
378-
} else {
379-
log("%s CLOSED: %s\n", closed.Relay.URL, closed.Reason)
375+
case closed, stillOpen := <-closeds:
376+
if stillOpen {
377+
if closed.HandledAuth {
378+
logverbose("%s CLOSED: %s\n", closed.Relay.URL, closed.Reason)
379+
} else {
380+
log("%s CLOSED: %s\n", closed.Relay.URL, closed.Reason)
381+
}
380382
}
381383
case <-ctx.Done():
382384
break readevents

0 commit comments

Comments
 (0)