Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: return the error in case of SSH connection pb #396

Merged
merged 1 commit into from
Dec 2, 2024
Merged

fix: return the error in case of SSH connection pb #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions cmd/admin_k9s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,16 @@ func setupSSHConnection(ctx context.Context) (*exec.Cmd, error) {
}

if err := waitForSSHConnection(ctx, "localhost:1080", 30*time.Second); err != nil {
err := sshCmd.Process.Kill()
if err != nil {
return nil, err
if killErr := sshCmd.Process.Kill(); killErr != nil {
log.Errorf("failed to kill SSH process: %v", killErr)
}
return nil, fmt.Errorf("error waiting for SSH connection: %v", err)
}

log.Info("SSH connection established successfully")
if err := os.Setenv("HTTPS_PROXY", "socks5://localhost:1080"); err != nil {
err := sshCmd.Process.Kill()
if err != nil {
return nil, err
if killErr := sshCmd.Process.Kill(); killErr != nil {
log.Errorf("failed to kill SSH process: %v", killErr)
}
return nil, fmt.Errorf("failed to set HTTPS_PROXY: %v", err)
}
Expand Down
Loading