fix: Close dangling SSH connections on memory

limanmys · May 23, 2023 · 994f47f · 994f47f
1 parent 5e07cc5
commit 994f47f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/internal/bridge/clean.go b/internal/bridge/clean.go
@@ -88,8 +88,9 @@ func Clean() {
 			case <-ch:
 				return
 			default:
-				_, _, err := tunnel.SshClient.SendRequest("keepalive@liman.dev", true, nil)
+				_, _, err := tunnel.SshClient.SendRequest("keepalive@openssh.com", true, nil)
 				if err != nil {
+					tunnel.SshClient.Close()
 					closeTunnel(tunnel, key)
 					logger.Sugar().Warnw("error when sending request")
 				}

diff --git a/internal/bridge/ssh_tunnel.go b/internal/bridge/ssh_tunnel.go
@@ -55,6 +55,8 @@ func (t *Tunnel) Start() {
 func (t *Tunnel) Stop() {
 	t.Started = false
 	t.log.Infow("collapsed tunnel", "details", t)
+	t.SshClient.Conn.Close()
+	t.SshClient.Close()
 	t.cancel()
 }
 
@@ -155,8 +157,12 @@ func (t *Tunnel) bindTunnel(ctx context.Context, wg *sync.WaitGroup) {
 			}
 		}()
 
-		<-ctx.Done()
-		return
+		select {
+		case <-ctx.Done():
+			return
+		case <-time.After(30 * time.Second):
+			fmt.Printf("(%v) retrying...\n", t)
+		}
 	}
 }