Merge 751c789cca6039f79a04a1b3a9e2e17fa795c7b3 into 27db6217ecda9236f5bc25c65824f1e723810751

Fix goroutine leaks
2025-04-24 08:41:29 +00:00 · 2025-01-15 14:33:03 +00:00 · 2025-01-15 22:32:48 +08:00
1 changed files with 3 additions and 7 deletions
--- a/server/proxy/xtcp.go
+++ b/server/proxy/xtcp.go
@ -19,8 +19,6 @@ import (
 	"reflect"
 	"sync"

-	"github.com/fatedier/golib/errors"
-
 	v1 "github.com/fatedier/frp/pkg/config/v1"
 	"github.com/fatedier/frp/pkg/msg"
 )
@ -90,11 +88,9 @@ func (pxy *XTCPProxy) Run() (remoteAddr string, err error) {
 }

 func (pxy *XTCPProxy) Close() {
-	pxy.BaseProxy.Close()
-	pxy.rc.NatHoleController.CloseClient(pxy.GetName())
 	pxy.closeOnce.Do(func() {
-		_ = errors.PanicToError(func() {
-			close(pxy.closeCh)
-		})
+		pxy.BaseProxy.Close()
+		pxy.rc.NatHoleController.CloseClient(pxy.GetName())
+		close(pxy.closeCh)
 	})
 }
Author	SHA1	Message	Date
Jeb.Wang	8ad9ec3d34	Merge 751c789cca6039f79a04a1b3a9e2e17fa795c7b3 into 27db6217ecda9236f5bc25c65824f1e723810751	2025-01-15 14:33:03 +00:00
Jeb.Wang	751c789cca	Fix goroutine leaks	2025-01-15 22:32:48 +08:00