Skip to content

Commit 7664832

Browse files
committed
Revert "Ensure tsnet is closed on exit"
This reverts commit 3efab8b.
1 parent 3efab8b commit 7664832

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

cmd/wush/cp.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ func cpCmd() *serpent.Command {
143143
if err != nil {
144144
return err
145145
}
146-
defer ts.Close()
147146

148147
logf("Bringing WireGuard up..")
149148
ts.Up(ctx)

cmd/wush/portforward.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ func portForwardCmd() *serpent.Command {
9797
if err != nil {
9898
return err
9999
}
100-
defer ts.Close()
100+
ts.Logf = func(string, ...any) {}
101+
ts.UserLogf = func(string, ...any) {}
101102

102103
logf("Bringing WireGuard up..")
103104
ts.Up(ctx)

cmd/wush/serve.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func serveCmd() *serpent.Command {
100100
if err != nil {
101101
return err
102102
}
103-
defer ts.Close()
104103

105104
ts.Up(ctx)
106105
fs := afero.NewOsFs()

cmd/wush/ssh.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func sshCmd() *serpent.Command {
4141
),
4242
Handler: func(inv *serpent.Invocation) error {
4343
ctx := inv.Context()
44-
defer fmt.Fprintln(inv.Stderr, "[exited]")
4544

4645
s, err := tsserver.NewServer(ctx, logger, send)
4746
if err != nil {
@@ -62,7 +61,6 @@ func sshCmd() *serpent.Command {
6261
if err != nil {
6362
return err
6463
}
65-
defer ts.Close()
6664

6765
logf("Bringing WireGuard up..")
6866
ts.Up(ctx)

0 commit comments

Comments
 (0)