OrgGo
/
frp
mirror of https://github.com/fatedier/frp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

client: lint

This commit is contained in:
fatedier 2021-10-19 15:02:45 +08:00
parent 1d26ea440b
commit f1a51eba18
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/control.go
View File

@ -185,11 +185,11 @@ func (ctl *Control) Close() error {
return ctl.GracefulClose(0) return ctl.GracefulClose(0)
} }
func (ctl *Control) GracefulClose(t time.Duration) error { func (ctl *Control) GracefulClose(d time.Duration) error {
ctl.pm.Close() ctl.pm.Close()
ctl.vm.Close() ctl.vm.Close()
time.Sleep(t) time.Sleep(d)
ctl.conn.Close() ctl.conn.Close()
if ctl.session != nil { if ctl.session != nil {

12
client/service.go
View File

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

2
cmd/frpc/sub/root.go
View File

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