fix teardown error using a separate context

evo-cloud · Aug 8, 2020 · 32a54df · 32a54df
1 parent 313602a
commit 32a54df
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/ssh/server.go b/pkg/ssh/server.go
@@ -347,7 +347,8 @@ func (c *connection) forwardRun(ctx context.Context, faddr forwardAddr, ln net.L
 	go closeWhenDone(ctx, ln)
 	defer func() {
 		c.removeListener(faddr, ln)
-		if err := c.server.setupForwarder(ctx, faddr.String(), localAddr, false); err != nil {
+		// Use a different context as the current one may be already canceled.
+		if err := c.server.setupForwarder(context.Background(), faddr.String(), localAddr, false); err != nil {
 			c.log("%s teardown error: %v", logPrefix, err)
 		}
 		c.log("%s", logPrefix)