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

builder/vmware: Handle interrupts while waiting for SSH

This commit is contained in:
Mitchell Hashimoto 2013-06-08 18:55:34 -07:00
parent be1e60aa26
commit 174ae65a12
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
builder/vmware/step_wait_for_ssh.go
View File

@ -44,18 +44,29 @@ func (s *stepWaitForSSH) Run(state map[string]interface{}) multistep.StepAction
log.Printf("Waiting for SSH, up to timeout: %s", config.SSHWaitTimeout.String()) log.Printf("Waiting for SSH, up to timeout: %s", config.SSHWaitTimeout.String())
select { timeout := time.After(config.SSHWaitTimeout)
case <-waitDone: for {
if err != nil { // Wait for either SSH to become available, a timeout to occur,
ui.Error(fmt.Sprintf("Error waiting for SSH: %s", err)) // or an interrupt to come through.
return multistep.ActionHalt select {
} case <-waitDone:
if err != nil {
ui.Error(fmt.Sprintf("Error waiting for SSH: %s", err))
return multistep.ActionHalt
}
state["communicator"] = comm state["communicator"] = comm
case <-time.After(config.SSHWaitTimeout): break
ui.Error("Timeout waiting for SSH.") case <-timeout:
s.cancel = true ui.Error("Timeout waiting for SSH.")
return multistep.ActionHalt s.cancel = true
return multistep.ActionHalt
case <-time.After(1 * time.Second):
if _, ok := state[multistep.StateCancelled]; ok {
log.Println("Interrupt detected, quitting waiting for SSH.")
return multistep.ActionHalt
}
}
} }
return multistep.ActionContinue return multistep.ActionContinue