TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: show nicer status output when logged out

Browse Source 
Also nicer output when running "down".

Fixes #1680

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-09 18:20:50 -07:00
parent 5c5acadb2a
commit 83402e2753
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tailscale/cli/down.go
View File

@ -8,6 +8,7 @@
"context" "context"
"fmt" "fmt"
"log" "log"
"os"
"time" "time"
"github.com/peterbourgon/ff/v2/ffcli" "github.com/peterbourgon/ff/v2/ffcli"
@ -33,10 +34,9 @@ func runDown(ctx context.Context, args []string) error {
return fmt.Errorf("error fetching current status: %w", err) return fmt.Errorf("error fetching current status: %w", err)
} }
if st.BackendState == "Stopped" { if st.BackendState == "Stopped" {
log.Printf("already stopped") fmt.Fprintf(os.Stderr, "Tailscale was already stopped.\n")
return nil return nil
} }
log.Printf("was in state %q", st.BackendState)
c, bc, ctx, cancel := connect(ctx) c, bc, ctx, cancel := connect(ctx)
defer cancel() defer cancel()
@ -51,7 +51,6 @@ func runDown(ctx context.Context, args []string) error {
log.Fatal(*n.ErrMessage) log.Fatal(*n.ErrMessage)
} }
if n.State != nil { if n.State != nil {
log.Printf("now in state %q", *n.State)
if *n.State == ipn.Stopped { if *n.State == ipn.Stopped {
cancel() cancel()
} }

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

@ -106,9 +106,24 @@ func runStatus(ctx context.Context, args []string) error {
return err return err
} }
if st.BackendState == ipn.Stopped.String() { switch st.BackendState {
default:
fmt.Fprintf(os.Stderr, "unexpected state: %s\n", st.BackendState)
os.Exit(1)
case ipn.Stopped.String():
fmt.Println("Tailscale is stopped.") fmt.Println("Tailscale is stopped.")
os.Exit(1) os.Exit(1)
case ipn.NeedsLogin.String():
fmt.Println("Logged out.")
if st.AuthURL != "" {
fmt.Printf("\nLog in at: %s\n", st.AuthURL)
}
os.Exit(1)
case ipn.NeedsMachineAuth.String():
fmt.Println("Machine is not yet authorized by tailnet admin.")
os.Exit(1)
case ipn.Running.String():
// Run below.
} }
var buf bytes.Buffer var buf bytes.Buffer