sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-03 07:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UP calls when state is idle (#338)

Browse Source 
* Fix UP calls when state is idle

When we want to login we can call server.Login
It already checks the login status of the peer

* Remove unused status

* Defer close daemon client conn

Co-authored-by: braginini <bangvalo@gmail.com>
This commit is contained in:
Maycon Santos
2022-05-27 19:16:58 +02:00
committed by GitHub
parent 4088aaf6fe
commit 258cb3d43b
2 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/cmd/up.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/netbirdio/netbird/client/internal" "github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/client/proto" "github.com/netbirdio/netbird/client/proto"
"github.com/netbirdio/netbird/util" "github.com/netbirdio/netbird/util"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
gstatus "google.golang.org/grpc/status" gstatus "google.golang.org/grpc/status"
@@ -55,7 +56,13 @@ var upCmd = &cobra.Command{
"If the daemon is not running please run: "+ "If the daemon is not running please run: "+
"\nnetbird service install \nnetbird service start\n", err) "\nnetbird service install \nnetbird service start\n", err)
} }
defer conn.Close() defer func() {
err := conn.Close()
if err != nil {
log.Warnf("failed closing dameon gRPC client connection %v", err)
return
}
}()
client := proto.NewDaemonServiceClient(conn) client := proto.NewDaemonServiceClient(conn)
@@ -64,7 +71,11 @@ var upCmd = &cobra.Command{
return fmt.Errorf("unable to get daemon status: %v", err) return fmt.Errorf("unable to get daemon status: %v", err)
} }
if status.Status == string(internal.StatusNeedsLogin) || status.Status == string(internal.StatusLoginFailed) { if status.Status == string(internal.StatusConnected) {
cmd.Println("Already connected")
return nil
}
loginRequest := proto.LoginRequest{ loginRequest := proto.LoginRequest{
SetupKey: setupKey, SetupKey: setupKey,
PreSharedKey: preSharedKey, PreSharedKey: preSharedKey,
@@ -104,10 +115,6 @@ var upCmd = &cobra.Command{
return fmt.Errorf("waiting sso login failed with: %v", err) return fmt.Errorf("waiting sso login failed with: %v", err)
} }
} }
} else if status.Status != string(internal.StatusIdle) {
cmd.Println("Already connected")
return nil
}
if _, err := client.Up(ctx, &proto.UpRequest{}); err != nil { if _, err := client.Up(ctx, &proto.UpRequest{}); err != nil {
return fmt.Errorf("call service up method: %v", err) return fmt.Errorf("call service up method: %v", err)

10
client/ui/client_ui.go
View File

@@ -259,21 +259,13 @@ func (s *serviceClient) menuUpClick() error {
return err return err
} }
status, err := conn.Status(s.ctx, &proto.StatusRequest{})
if err != nil {
log.Errorf("get service status: %v", err)
return err
}
if status.Status == string(internal.StatusNeedsLogin) || status.Status == string(internal.StatusLoginFailed) {
err = s.login() err = s.login()
if err != nil { if err != nil {
log.Errorf("get service status: %v", err) log.Errorf("get service status: %v", err)
return err return err
} }
}
status, err = conn.Status(s.ctx, &proto.StatusRequest{}) status, err := conn.Status(s.ctx, &proto.StatusRequest{})
if err != nil { if err != nil {
log.Errorf("get service status: %v", err) log.Errorf("get service status: %v", err)
return err return err