zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(netclient): rework the returned errors on list command

Browse Source
This commit is contained in:
Adrien Raffin-Caboisse
2021-10-15 15:52:29 +02:00
parent 2c0a470390
commit bfd0c00ef2
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netclient/functions/list.go
View File

@@ -3,7 +3,6 @@ package functions
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"log"
nodepb "github.com/gravitl/netmaker/grpc" nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
@@ -93,7 +92,7 @@ func getPeers(network string) ([]Peer, error) {
ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL)) ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
if err != nil { if err != nil {
log.Fatalf("Unable to establish client connection to localhost:50051: %v", err) return []Peer{}, fmt.Errorf("connecting to %v: %w", cfg.Server.GRPCAddress, err)
} }
defer conn.Close() defer conn.Close()
// Instantiate the BlogServiceClient with our client connection to the server // Instantiate the BlogServiceClient with our client connection to the server
@@ -106,19 +105,16 @@ func getPeers(network string) ([]Peer, error) {
ctx, err := auth.SetJWT(wcclient, network) ctx, err := auth.SetJWT(wcclient, network)
if err != nil { if err != nil {
log.Println("Failed to authenticate.") return []Peer{}, fmt.Errorf("authenticating: %w", err)
return []Peer{}, err
} }
var header metadata.MD var header metadata.MD
response, err := wcclient.GetPeers(ctx, req, grpc.Header(&header)) response, err := wcclient.GetPeers(ctx, req, grpc.Header(&header))
if err != nil { if err != nil {
log.Println("Error retrieving peers") return []Peer{}, fmt.Errorf("retrieving peers: %w", err)
return []Peer{}, err
} }
if err := json.Unmarshal([]byte(response.GetData()), &nodes); err != nil { if err := json.Unmarshal([]byte(response.GetData()), &nodes); err != nil {
log.Println("Error unmarshaling data for peers") return []Peer{}, fmt.Errorf("unmarshaling data for peers: %w", err)
return []Peer{}, err
} }
peers := []Peer{} peers := []Peer{}