client: lint

client/control.go

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

client/service.go

@@ -311,14 +311,14 @@ func (svr *Service) ReloadConf(pxyCfgs map[string]config.ProxyConf, 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)
 	if svr.ctl != nil {
-		if t > 0 {
-			svr.ctl.GracefulClose(t)
-		} else {
-			svr.ctl.Close()
-		}
+		svr.ctl.GracefulClose(d)
 	}
 	svr.cancel()
 }

cmd/frpc/sub/root.go

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