Merge pull request #672 from c4dt/streaming_do-not-error-on-close

websocket: do not error on service's close
dedis · Jan 27, 2021 · 3329440 · 3329440
2 parents 3f25c1c + 1ad1b87
commit 3329440
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/websocket.go b/websocket.go
@@ -350,9 +350,11 @@ outerReadLoop:
 				break outerReadLoop
 			case reply, ok := <-outChan:
 				if !ok {
-					err = xerrors.New("service finished streaming")
+					ws.WriteControl(websocket.CloseMessage,
+						websocket.FormatCloseMessage(websocket.CloseNormalClosure, "service finished streaming"),
+						time.Now().Add(time.Millisecond*500))
 					close(clientInputs)
-					break outerReadLoop
+					return
 				}
 				tx += len(reply)