Bladeren bron

frpc: exit with code 1 if first login failed (#3740)

fatedier 1 jaar geleden
bovenliggende
commit
5760c1cf92
3 gewijzigde bestanden met toevoegingen van 5 en 10 verwijderingen
  1. 1 1
      Release.md
  2. 2 3
      client/service.go
  3. 2 6
      cmd/frpc/sub/root.go

+ 1 - 1
Release.md

@@ -1,3 +1,3 @@
 ### Fixes
 
-* `admin_user` is not effective in the INI configuration.
+* frpc: Return code 1 when the first login attempt fails and exits.

+ 2 - 3
client/service.go

@@ -83,8 +83,8 @@ func NewService(
 	pxyCfgs []v1.ProxyConfigurer,
 	visitorCfgs []v1.VisitorConfigurer,
 	cfgFile string,
-) (svr *Service, err error) {
-	svr = &Service{
+) *Service {
+	return &Service{
 		authSetter:  auth.NewAuthSetter(cfg.Auth),
 		cfg:         cfg,
 		cfgFile:     cfgFile,
@@ -93,7 +93,6 @@ func NewService(
 		ctx:         context.Background(),
 		exit:        0,
 	}
-	return
 }
 
 func (svr *Service) GetController() *Control {

+ 2 - 6
cmd/frpc/sub/root.go

@@ -139,10 +139,7 @@ func startService(
 		log.Info("start frpc service for config file [%s]", cfgFile)
 		defer log.Info("frpc service for config file [%s] stopped", cfgFile)
 	}
-	svr, err := client.NewService(cfg, pxyCfgs, visitorCfgs, cfgFile)
-	if err != nil {
-		return err
-	}
+	svr := client.NewService(cfg, pxyCfgs, visitorCfgs, cfgFile)
 
 	shouldGracefulClose := cfg.Transport.Protocol == "kcp" || cfg.Transport.Protocol == "quic"
 	// Capture the exit signal if we use kcp or quic.
@@ -150,6 +147,5 @@ func startService(
 		go handleTermSignal(svr)
 	}
 
-	_ = svr.Run(context.Background())
-	return nil
+	return svr.Run(context.Background())
 }