Browse Source

fix: kcp protocol cause delay release resource (#2621)

Co-authored-by: blizard863 <760076784@qq.com>
pull/2630/head
Blizard 3 years ago committed by GitHub
parent
commit
1d26ea440b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      client/control.go
  2. 8
      client/service.go
  3. 3
      cmd/frpc/sub/root.go

9
client/control.go

@ -182,9 +182,16 @@ func (ctl *Control) HandleNewProxyResp(inMsg *msg.NewProxyResp) {
}
func (ctl *Control) Close() error {
return ctl.GracefulClose(0)
}
func (ctl *Control) GracefulClose(t time.Duration) error {
ctl.pm.Close()
ctl.conn.Close()
ctl.vm.Close()
time.Sleep(t)
ctl.conn.Close()
if ctl.session != nil {
ctl.session.Close()
}

8
client/service.go

@ -311,10 +311,14 @@ func (svr *Service) ReloadConf(pxyCfgs map[string]config.ProxyConf, visitorCfgs
return svr.ctl.ReloadConf(pxyCfgs, visitorCfgs)
}
func (svr *Service) Close() {
func (svr *Service) Close(t time.Duration) {
atomic.StoreUint32(&svr.exit, 1)
if svr.ctl != nil {
svr.ctl.Close()
if t > 0 {
svr.ctl.GracefulClose(t)
} else {
svr.ctl.Close()
}
}
svr.cancel()
}

3
cmd/frpc/sub/root.go

@ -124,8 +124,7 @@ func handleSignal(svr *client.Service) {
ch := make(chan os.Signal)
signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
<-ch
svr.Close()
time.Sleep(250 * time.Millisecond)
svr.Close(time.Millisecond * 250)
close(kcpDoneCh)
}

Loading…
Cancel
Save