client: fix potentially dropped streaming errors

a9c95bda · Michael Schurter · Michael Schurter · a27e3af8 · a9c95bda
Commit a9c95bda authored 6 years ago by Michael Schurter Committed by Michael Schurter 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 0 deletions
+9 -0
--- a/client/fs_endpoint.go
+++ b/client/fs_endpoint.go
@@ -276,6 +276,15 @@ OUTER:
 			break OUTER
 		case frame, ok := <-frames:
 			if !ok {
+				// frame may have been closed when an error
+				// occurred. Check once more for an error.
+				select {
+				case streamErr = <-errCh:
+					// There was a pending error!
+				default:
+					// No error, continue on
+				}
 				break OUTER
 			}