oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pingerCtx 泄漏

Browse Source
This commit is contained in:
creamlike1024
2025-05-28 21:34:45 +08:00
parent e01b517843
commit 361b0abec9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
relay/channel/api_request.go
View File

@@ -122,11 +122,13 @@ func doRequest(c *gin.Context, req *http.Request, info *common.RelayInfo) (*http
var pingerWg sync.WaitGroup var pingerWg sync.WaitGroup
if info.IsStream { if info.IsStream {
helper.SetEventStreamHeaders(c) helper.SetEventStreamHeaders(c)
pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
var pingerCtx context.Context
pingerCtx, stopPinger = context.WithCancel(c.Request.Context())
if pingEnabled { if pingEnabled {
pingInterval := time.Duration(generalSettings.PingIntervalSeconds) * time.Second
var pingerCtx context.Context
pingerCtx, stopPinger = context.WithCancel(c.Request.Context())
// 退出时清理 pingerCtx 防止泄露
defer stopPinger()
pingerWg.Add(1) pingerWg.Add(1)
gopool.Go(func() { gopool.Go(func() {
defer pingerWg.Done() defer pingerWg.Done()
@@ -166,9 +168,8 @@ func doRequest(c *gin.Context, req *http.Request, info *common.RelayInfo) (*http
} }
resp, err := client.Do(req) resp, err := client.Do(req)
// request结束后停止ping // request结束后等待 ping goroutine 完成
if info.IsStream && pingEnabled { if info.IsStream && pingEnabled {
stopPinger()
pingerWg.Wait() pingerWg.Wait()
} }
if err != nil { if err != nil {