cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: close of closed channel

Browse Source
This commit is contained in:
wuqinqiang 2023-12-21 10:53:27 +08:00
parent 2d67e2e0c6
commit 8adf35d480
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/wait/backoff.go
View File

@ -16,6 +16,7 @@ package wait
import ( import (
"math/rand" "math/rand"
"sync"
"time" "time"
"github.com/samber/lo" "github.com/samber/lo"
@ -182,13 +183,15 @@ func Until(f func(), period time.Duration, stopCh <-chan struct{}) {
func MergeAndCloseOnAnyStopChannel[T any](upstreams ...<-chan T) <-chan T { func MergeAndCloseOnAnyStopChannel[T any](upstreams ...<-chan T) <-chan T {
out := make(chan T) out := make(chan T)
closeOnce := sync.Once{}
for _, upstream := range upstreams { for _, upstream := range upstreams {
ch := upstream ch := upstream
go lo.Try0(func() { go lo.Try0(func() {
select { select {
case <-ch: case <-ch:
closeOnce.Do(func() {
close(out) close(out)
})
case <-out: case <-out:
} }
}) })