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

make sure err is propagated

pull/1524/head^2
Darien Raymond 2018-08-05 17:56:49 +02:00
parent 8d7fab6aea
commit 8ed119e3f6
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/task/task.go
View File

@ -88,8 +88,8 @@ func OnFailure(task Task) ExecutionOption {
} }
} }
func Single(task Task, opts ExecutionOption) Task { func Single(task Task, opts ...ExecutionOption) Task {
return Run(append([]ExecutionOption{Sequential(task)}, opts)...) return Run(append([]ExecutionOption{Sequential(task)}, opts...)...)
} }
func Run(opts ...ExecutionOption) Task { func Run(opts ...ExecutionOption) Task {
@ -120,14 +120,17 @@ func executeParallel(ctx context.Context, tasks []Task) error {
for _, task := range tasks { for _, task := range tasks {
<-s.Wait() <-s.Wait()
go func(f func() error) { go func(f Task) {
if err := f(); err != nil { err := f()
select { if err == nil {
case done <- err: s.Signal()
default: return
} }
select {
case done <- err:
default:
} }
s.Signal()
}(task) }(task)
} }