iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

communicator/ssh: style 

/cc @markpeek - The main thing is that the style for variables/methods
in Go is to use CamelCase (with the first letter generally downcased
unless an exported thing).
This commit is contained in:
Mitchell Hashimoto 2013-07-19 14:16:39 -04:00
parent c80db71361
commit 5b8c372fdc
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
communicator/ssh/communicator.go
View File

@ -116,11 +116,11 @@ func (c *comm) Upload(path string, input io.Reader) error {
}() }()
// Get a pipe to stdout so that we can get responses back // Get a pipe to stdout so that we can get responses back
scp_reader, err := session.StdoutPipe() stdoutPipe, err := session.StdoutPipe()
if err != nil { if err != nil {
return err return err
} }
r := bufio.NewReader(scp_reader) stdoutR := bufio.NewReader(stdoutPipe)
// Set stderr to a bytes buffer // Set stderr to a bytes buffer
stderr := new(bytes.Buffer) stderr := new(bytes.Buffer)
@ -149,14 +149,14 @@ func (c *comm) Upload(path string, input io.Reader) error {
// Start the protocol // Start the protocol
log.Println("Beginning file upload...") log.Println("Beginning file upload...")
fmt.Fprintln(w, "C0644", input_memory.Len(), target_file) fmt.Fprintln(w, "C0644", input_memory.Len(), target_file)
err = check_response(r) err = checkSCPStatus(stdoutR)
if err != nil { if err != nil {
return err return err
} }
io.Copy(w, input_memory) io.Copy(w, input_memory)
fmt.Fprint(w, "\x00") fmt.Fprint(w, "\x00")
err = check_response(r) err = checkSCPStatus(stdoutR)
if err != nil { if err != nil {
return err return err
} }
@ -235,16 +235,24 @@ func (c *comm) reconnect() (err error) {
return return
} }
func check_response(r *bufio.Reader) (err error) { // checkSCPStatus checks that a prior command sent to SCP completed
scp_status_code, err := r.ReadByte() // successfully. If it did not complete successfully, an error will
// be returned.
func checkSCPStatus(r *bufio.Reader) error {
code, err := r.ReadByte()
if err != nil { if err != nil {
return err return err
} }
if scp_status_code != 0 {
if code != 0 {
// Treat any non-zero (really 1 and 2) as fatal errors // Treat any non-zero (really 1 and 2) as fatal errors
error_message, _, err := r.ReadLine() message, _, err := r.ReadLine()
err = fmt.Errorf(string(error_message[:])) if err != nil {
return err return fmt.Errorf("Error reading error message: %s", err)
}
return errors.New(string(message))
} }
return nil return nil
} }