fix(pkg/client): allow the outputs watch to say goodbye

Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com> Co-Authored-By: Leonardo Grasso <me@leonardograsso.com> Signed-off-by: Lorenzo Fontana <lo@linux.com>
holyspectral · Jun 30, 2020 · 4f09e3e · 4f09e3e
1 parent 21da9cd
commit 4f09e3e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -131,11 +131,9 @@ func (c *Client) OutputsWatch(ctx context.Context,
 	go func() {
 		for {
 			res, err := fcs.Recv()
-			if err == io.EOF {
-				break
-			}
 			if err != nil {
-				errCh <- fmt.Errorf("error closing stream after EOF: %v", err)
+				errCh <- err
+				return
 			}
 			resCh <- res
 		}
@@ -149,6 +147,9 @@ func (c *Client) OutputsWatch(ctx context.Context,
 				return err
 			}
 		case err := <-errCh:
+			if err == io.EOF {
+				return nil
+			}
 			return err
 		case <-time.After(timeout):
 			fcs.Send(&outputs.Request{})