simplify error propagation

8 years ago · 54b441d690
parent bf64c449de
commit 54b441d690
1 changed files with 4 additions and 4 deletions
--- a/common/signal/exec.go
+++ b/common/signal/exec.go
@ -32,13 +32,13 @@ func ErrorOrFinish2(ctx context.Context, c1, c2 <-chan error) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
-	case err, failed := <-c1:
+	case err := <-c1:
-		if failed {
+		if err != nil {
 			return err
 		}
 		return ErrorOrFinish1(ctx, c2)
-	case err, failed := <-c2:
+	case err := <-c2:
-		if failed {
+		if err != nil {
 			return err
 		}
 		return ErrorOrFinish1(ctx, c1)