From 751c789cca6039f79a04a1b3a9e2e17fa795c7b3 Mon Sep 17 00:00:00 2001 From: "Jeb.Wang" Date: Wed, 15 Jan 2025 22:32:48 +0800 Subject: [PATCH] Fix goroutine leaks --- server/proxy/xtcp.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/server/proxy/xtcp.go b/server/proxy/xtcp.go index 4c555de26a6..1ccf331c49d 100644 --- 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) }) }