FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add SSH master connection feature by deansheather · Pull Request #116 · coder/sshcode · GitHub

This repository was archived by the owner on Jan 17, 2021. It is now read-only.
  1. coder
  2. sshcode

Repository navigation

Add SSH master connection feature #116

Merged
deansheather merged 8 commits into from
Jun 28, 2019
Conversation 46 Commits 8 Checks 0 Files changed
Merged

Add SSH master connection feature #116

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e646d57
add SSH master connection feature
deansheather Jun 12, 2019
3141f7f
move SSH master process tidyup to a deferred func
deansheather Jun 13, 2019
4d64fc0
add "process is running" check to checkSSHMaster()
deansheather Jun 13, 2019
eee34f5
add ~/.ssh directory sanity check before starting
deansheather Jun 15, 2019
3794755
restructure SSH master code, apply requested fixes
deansheather Jun 27, 2019
dbf7a48
add comment about tildes in expandPath
deansheather Jun 27, 2019
1bc6ac0
Merge branch 'master' into reuse-ssh-connection
deansheather Jun 27, 2019
bbd94c5
Merge branch 'master' into reuse-ssh-connection
deansheather Jun 28, 2019
File filter

Filter by extension

Filter by extension .go  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
add "process is running" check to checkSSHMaster() 
Checks if the master process is running by sending signal 0 to it.
According to kill(2), sending a signal of 0 will send no signal but will
still perform error checking.

To prevent the SSH master from becoming a zombie process, a wait call
was added in a goroutine.
  • Loading branch information
deansheather committed Jun 13, 2019
commit 4d64fc0393636307296b2bd5db7577ecb5ea28a4
43 changes: 29 additions & 14 deletions sshcode.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"os/signal"
"path/filepath"
"strconv"
"syscall"
"strings"
"syscall"
"time"

"github.com/pkg/browser"
Expand Down Expand Up @@ -67,9 +67,13 @@ func sshCode(host, dir string, o options) error {
sshMasterCmd.Stdin = os.Stdin
sshMasterCmd.Stdout = os.Stdout
sshMasterCmd.Stderr = os.Stderr
Comment thread
sreya marked this conversation as resolved.
Outdated
stopSSHMaster := func () {
stopSSHMaster := func() {
if sshMasterCmd.Process != nil {
err := sshMasterCmd.Process.Signal(syscall.SIGTERM)
err := sshMasterCmd.Process.Signal(syscall.Signal(0))
Comment thread
deansheather marked this conversation as resolved.
Outdated
if err != nil {
return
}
err = sshMasterCmd.Process.Signal(syscall.SIGTERM)
if err != nil {
flog.Error("failed to send SIGTERM to SSH master process: %v", err)
}
Expand All @@ -78,12 +82,13 @@ func sshCode(host, dir string, o options) error {
defer stopSSHMaster()

err = sshMasterCmd.Start()
go sshMasterCmd.Wait()
Comment thread
deansheather marked this conversation as resolved.
Outdated
if err != nil {
flog.Error("failed to start SSH master connection, disabling connection reuse feature: %v", err)
o.noReuseConnection = true
stopSSHMaster()
Comment thread
deansheather marked this conversation as resolved.
Outdated
} else {
err = checkSSHMaster(newSSHFlags, host)
err = checkSSHMaster(sshMasterCmd, newSSHFlags, host)
if err != nil {
flog.Error("SSH master failed to be ready in time, disabling connection reuse feature: %v", err)
o.noReuseConnection = true
Expand Down Expand Up @@ -307,22 +312,32 @@ func randomPort() (string, error) {

// checkSSHMaster polls every second for 30 seconds to check if the SSH master
// is ready.
func checkSSHMaster(sshFlags string, host string) (err error) {
maxTries := 30
check := func() error {
func checkSSHMaster(sshMasterCmd *exec.Cmd, sshFlags string, host string) error {
var (
maxTries = 30
sleepDur = time.Second
err error
)
for i := 0; i < maxTries; i++ {
// Check if the master is running
if sshMasterCmd.Process == nil {
return xerrors.Errorf("SSH master process not running")
}
err = sshMasterCmd.Process.Signal(syscall.Signal(0))
Comment thread
deansheather marked this conversation as resolved.
Outdated
if err != nil {
return xerrors.Errorf("failed to check if SSH master process was alive: %v", err)
}

// Check if it's ready
sshCmdStr := fmt.Sprintf(`ssh %v -O check %v`, sshFlags, host)
sshCmd := exec.Command("sh", "-c", sshCmdStr)
return sshCmd.Run()
}

for i := 0; i < maxTries; i++ {
err = check()
err = sshCmd.Run()
if err == nil {
return nil
}
time.Sleep(time.Second)
time.Sleep(sleepDur)
}
return err
return xerrors.Errorf("max number of tries exceeded: %d", maxTries)
}

func syncUserSettings(sshFlags string, host string, back bool) error {
Expand Down
Back | FazBrowse Home | New Git URL