PBM-397: return ctx.Err() from ListenCmd()

percona · Sep 30, 2024 · a0fa275 · a0fa275
1 parent 20103f1
commit a0fa275
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pbm/ctrl/recv.go b/pbm/ctrl/recv.go
@@ -44,6 +44,9 @@ func ListenCmd(ctx context.Context, m connect.Client, cl <-chan struct{}) (<-cha
 		var lastCmd Command
 		for {
 			select {
+			case <-ctx.Done():
+				errc <- ctx.Err()
+				return
 			case <-cl:
 				return
 			default:
@@ -54,9 +57,6 @@ func ListenCmd(ctx context.Context, m connect.Client, cl <-chan struct{}) (<-cha
 			)
 			if err != nil {
 				errc <- errors.Wrap(err, "watch the cmd stream")
-				if errors.Is(err, context.Canceled) {
-					return
-				}
 				continue
 			}