lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/tailscale/cli: avoid a spammy log message on SIGINT 

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/1718/head
Brad Fitzpatrick 2021-04-16 08:00:31 -07:00
parent 670838c45f
commit 6da812b4cf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tailscale/cli/cli.go
View File

@ -24,6 +24,7 @@ import (
"tailscale.com/ipn" "tailscale.com/ipn"
"tailscale.com/paths" "tailscale.com/paths"
"tailscale.com/safesocket" "tailscale.com/safesocket"
"tailscale.com/syncs"
) )
// ActLikeCLI reports whether a GUI application should act like the // ActLikeCLI reports whether a GUI application should act like the
@ -109,6 +110,8 @@ var rootArgs struct {
socket string socket string
} }
var gotSignal syncs.AtomicBool
func connect(ctx context.Context) (net.Conn, *ipn.BackendClient, context.Context, context.CancelFunc) { func connect(ctx context.Context) (net.Conn, *ipn.BackendClient, context.Context, context.CancelFunc) {
c, err := safesocket.Connect(rootArgs.socket, 41112) c, err := safesocket.Connect(rootArgs.socket, 41112)
if err != nil { if err != nil {
@ -133,6 +136,7 @@ func connect(ctx context.Context) (net.Conn, *ipn.BackendClient, context.Context
signal.Reset(syscall.SIGINT, syscall.SIGTERM) signal.Reset(syscall.SIGINT, syscall.SIGTERM)
return return
} }
gotSignal.Set(true)
c.Close() c.Close()
cancel() cancel()
}() }()
@ -150,7 +154,9 @@ func pump(ctx context.Context, bc *ipn.BackendClient, conn net.Conn) {
if ctx.Err() != nil { if ctx.Err() != nil {
return return
} }
if !gotSignal.Get() {
log.Printf("ReadMsg: %v\n", err) log.Printf("ReadMsg: %v\n", err)
}
break break
} }
bc.GotNotifyMsg(msg) bc.GotNotifyMsg(msg)