starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-03-29 21:52:12 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

Unwrap grpc errors to make nicer user facing errors

Browse Source
This commit is contained in:
Kristoffer Dalby
2021-11-07 10:15:32 +00:00
parent b11acad1c9
commit d47b83f80b
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/headscale/cli/routes.go
View File

@@ -8,6 +8,7 @@ import (
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/pterm/pterm"
"github.com/spf13/cobra"
"google.golang.org/grpc/status"
)
func init() {
@@ -59,7 +60,7 @@ var listRoutesCmd = &cobra.Command{
response, err := client.GetMachineRoute(ctx, request)
if err != nil {
ErrorOutput(err, fmt.Sprintf("Cannot get nodes: %s", err), output)
ErrorOutput(err, fmt.Sprintf("Cannot get nodes: %s", status.Convert(err).Message()), output)
return
}
@@ -115,7 +116,7 @@ omit the route you do not want to enable.
response, err := client.EnableMachineRoutes(ctx, request)
if err != nil {
ErrorOutput(err, fmt.Sprintf("Cannot register machine: %s\n", err), output)
ErrorOutput(err, fmt.Sprintf("Cannot register machine: %s\n", status.Convert(err).Message()), output)
return
}