ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

helper/ssh: Cleanups

This commit is contained in:
Armon Dadgar 2014-10-13 12:47:55 -07:00
parent d7e77202ba
commit 5a3f80559c
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helper/ssh/communicator.go
View File

@ -3,7 +3,6 @@ package ssh
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"code.google.com/p/go.crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -14,6 +13,8 @@ import (
"path/filepath" "path/filepath"
"sync" "sync"
"time" "time"
"code.google.com/p/go.crypto/ssh"
) )
// RemoteCmd represents a remote command being prepared or run. // RemoteCmd represents a remote command being prepared or run.
@ -145,11 +146,6 @@ func (c *SSHCommunicator) Start(cmd *RemoteCmd) (err error) {
return return
} }
// A channel to keep track of our done state
doneCh := make(chan struct{})
sessionLock := new(sync.Mutex)
timedOut := false
// Start a goroutine to wait for the session to end and set the // Start a goroutine to wait for the session to end and set the
// exit boolean and status. // exit boolean and status.
go func() { go func() {
@ -164,17 +160,8 @@ func (c *SSHCommunicator) Start(cmd *RemoteCmd) (err error) {
} }
} }
sessionLock.Lock()
defer sessionLock.Unlock()
if timedOut {
// We timed out, so set the exit status to -1
exitStatus = -1
}
log.Printf("remote command exited with '%d': %s", exitStatus, cmd.Command) log.Printf("remote command exited with '%d': %s", exitStatus, cmd.Command)
cmd.SetExited(exitStatus) cmd.SetExited(exitStatus)
close(doneCh)
}() }()
return return