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

ipn/ipnlocal: logout ephemeral nodes on shutdown

Browse Source 
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-07-18 20:36:14 -07:00 committed by Maisem Ali
parent 393a229de9
commit 4d0461f721
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscaled/tailscaled.go
View File

@ -404,7 +404,6 @@ func run() error {
// want to keep running. // want to keep running.
signal.Ignore(syscall.SIGPIPE) signal.Ignore(syscall.SIGPIPE)
go func() { go func() {
defer dialer.Close()
select { select {
case s := <-interrupt: case s := <-interrupt:
logf("tailscaled got signal %v; shutting down", s) logf("tailscaled got signal %v; shutting down", s)
@ -437,6 +436,7 @@ func run() error {
if err != nil { if err != nil {
return fmt.Errorf("safesocket.Listen: %v", err) return fmt.Errorf("safesocket.Listen: %v", err)
} }
defer dialer.Close()
err = srv.Run(ctx, ln) err = srv.Run(ctx, ln)
// Cancelation is not an error: it is the only way to stop ipnserver. // Cancelation is not an error: it is the only way to stop ipnserver.

12
ipn/ipnlocal/local.go
View File

@ -342,7 +342,19 @@ func (b *LocalBackend) onHealthChange(sys health.Subsystem, err error) {
// can no longer be used after Shutdown returns. // can no longer be used after Shutdown returns.
func (b *LocalBackend) Shutdown() { func (b *LocalBackend) Shutdown() {
b.mu.Lock() b.mu.Lock()
if b.shutdownCalled {
b.mu.Unlock()
return
}
b.shutdownCalled = true b.shutdownCalled = true
if b.loginFlags&controlclient.LoginEphemeral != 0 {
b.mu.Unlock()
ctx, cancel := context.WithTimeout(b.ctx, 5*time.Second)
defer cancel()
b.LogoutSync(ctx) // best effort
b.mu.Lock()
}
cc := b.cc cc := b.cc
if b.sshServer != nil { if b.sshServer != nil {
b.sshServer.Shutdown() b.sshServer.Shutdown()