Merge pull request #107 from boinkor-net/better-shutdown

antifuchs · web-flow · commit 7b3b309ac7d3 · 2025-05-07T13:30:00.000Z
Detach tsnet cancellation from SSH server termination
diff --git a/ssh.go b/ssh.go
@@ -85,7 +85,11 @@ func (s *TailnetSSH) Run(ctx context.Context) error {
 		return fmt.Errorf("could not setup a tsnet server: %w", err)
 	}
 
-	_, err = srv.Up(ctx)
+	// Do not shut down the tsnet server as soon as we're meant
+	// to close client connections; it shuts down after the
+	// SSH server terminates.
+	netCtx := context.WithoutCancel(ctx)
+	_, err = srv.Up(netCtx)
 	if err != nil {
 		return fmt.Errorf("could not connect to tailnet: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,11 @@ func (s *TailnetSSH) Run(ctx context.Context) error {`
`85`	`85`	`return fmt.Errorf("could not setup a tsnet server: %w", err)`
`86`	`86`	`}`
`87`	`87`
`88`		`- _, err = srv.Up(ctx)`
	`88`	`+ // Do not shut down the tsnet server as soon as we're meant`
	`89`	`+ // to close client connections; it shuts down after the`
	`90`	`+ // SSH server terminates.`
	`91`	`+ netCtx := context.WithoutCancel(ctx)`
	`92`	`+ _, err = srv.Up(netCtx)`
`89`	`93`	`if err != nil {`
`90`	`94`	`return fmt.Errorf("could not connect to tailnet: %w", err)`
`91`	`95`	`}`