TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-29 12:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale: make status --peers=false work earlier + in JSON mode

Browse Source 
And return an error if you use non-flag arguments.

Change-Id: I0dd6c357eb5cabd0f17020f21ba86406aea21681
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-03-24 13:05:36 -07:00 committed by Brad Fitzpatrick
parent 5df12b9059
commit 06fcf3b225
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/tailscale/cli/status.go
View File

@ -8,6 +8,7 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
"errors"
"flag" "flag"
"fmt" "fmt"
"net" "net"
@ -69,7 +70,14 @@ var statusArgs struct {
} }
func runStatus(ctx context.Context, args []string) error { func runStatus(ctx context.Context, args []string) error {
st, err := tailscale.Status(ctx) if len(args) > 0 {
return errors.New("unexpected non-flag arguments to 'tailscale status'")
}
getStatus := tailscale.Status
if !statusArgs.peers {
getStatus = tailscale.StatusWithoutPeers
}
st, err := getStatus(ctx)
if err != nil { if err != nil {
return fixTailscaledConnectError(err) return fixTailscaledConnectError(err)
} }