github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

simplify error propagation

pull/432/merge
Darien Raymond 2017-04-17 19:33:22 +02:00
parent bf64c449de
commit 54b441d690
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/signal/exec.go
View File

@ -32,13 +32,13 @@ func ErrorOrFinish2(ctx context.Context, c1, c2 <-chan error) error {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
case err, failed := <-c1: case err := <-c1:
if failed { if err != nil {
return err return err
} }
return ErrorOrFinish1(ctx, c2) return ErrorOrFinish1(ctx, c2)
case err, failed := <-c2: case err := <-c2:
if failed { if err != nil {
return err return err
} }
return ErrorOrFinish1(ctx, c1) return ErrorOrFinish1(ctx, c1)