docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detect vboxmanage error conditions and pass those on as errors 

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
This commit is contained in:
Sven Dowideit 2015-02-11 22:02:15 +10:00
parent e26d48ab5b
commit de62c65a71
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/virtualbox/vbm.go
View File

@ -55,35 +55,13 @@ func setVBoxManageCmd() string {
} }
func vbm(args ...string) error { func vbm(args ...string) error {
cmd := exec.Command(vboxManageCmd, args...) _, _, err := vbmOutErr(args...)
if os.Getenv("DEBUG") != "" { return err
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
}
log.Debugf("executing: %v %v", vboxManageCmd, strings.Join(args, " "))
if err := cmd.Run(); err != nil {
if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound {
return ErrVBMNotFound
}
return fmt.Errorf("%v %v failed: %v", vboxManageCmd, strings.Join(args, " "), err)
}
return nil
} }
func vbmOut(args ...string) (string, error) { func vbmOut(args ...string) (string, error) {
cmd := exec.Command(vboxManageCmd, args...) stdout, _, err := vbmOutErr(args...)
if os.Getenv("DEBUG") != "" { return stdout, err
cmd.Stderr = os.Stderr
}
log.Debugf("executing: %v %v", vboxManageCmd, strings.Join(args, " "))
b, err := cmd.Output()
if err != nil {
if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound {
err = ErrVBMNotFound
}
}
return string(b), err
} }
func vbmOutErr(args ...string) (string, string, error) { func vbmOutErr(args ...string) (string, string, error) {
@ -94,10 +72,19 @@ func vbmOutErr(args ...string) (string, string, error) {
cmd.Stdout = &stdout cmd.Stdout = &stdout
cmd.Stderr = &stderr cmd.Stderr = &stderr
err := cmd.Run() err := cmd.Run()
stderrStr := stderr.String()
log.Debugf("STDOUT: %v", stdout.String())
log.Debugf("STDERR: %v", stderrStr)
if err != nil { if err != nil {
if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound { if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound {
err = ErrVBMNotFound err = ErrVBMNotFound
} }
} else {
// VBoxManage will sometimes not set the return code, but has a fatal error
// such as VBoxManage.exe: error: VT-x is not available. (VERR_VMX_NO_VMX)
if strings.Contains(stderrStr, "error:") {
err = fmt.Errorf("%v %v failed: %v", vboxManageCmd, strings.Join(args, " "), stderrStr)
}
} }
return stdout.String(), stderr.String(), err return stdout.String(), stderrStr, err
} }