chore: Code cleanup

limanmys · May 24, 2023 · 34a310c · 34a310c
1 parent 994f47f
commit 34a310c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/bridge/clean.go b/internal/bridge/clean.go
@@ -90,7 +90,9 @@ func Clean() {
 			default:
 				_, _, err := tunnel.SshClient.SendRequest("keepalive@openssh.com", true, nil)
 				if err != nil {
-					tunnel.SshClient.Close()
+					if tunnel.SshClient != 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,8 +55,9 @@ 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()
+	if t.SshClient != nil {
+		t.SshClient.Close()
+	}
 	t.cancel()
 }