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

Fix formatting and non-returning of error 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-05-06 17:52:29 -07:00
parent ce0e365e10
commit 8887ca2fed
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commands/commands.go
View File

@ -543,6 +543,9 @@ func getMachineConfig(c *cli.Context) (*machineConfig, error) {
} }
m, err := mcn.Get(name) m, err := mcn.Get(name)
if err != nil {
return nil, err
}
machineDir := filepath.Join(utils.GetMachineDir(), m.Name) machineDir := filepath.Join(utils.GetMachineDir(), m.Name)
caCert := filepath.Join(machineDir, "ca.pem") caCert := filepath.Join(machineDir, "ca.pem")

2
utils/utils.go
View File

@ -112,7 +112,7 @@ func WaitForDocker(ip string, daemonPort int) error {
return WaitFor(func() bool { return WaitFor(func() bool {
conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", ip, daemonPort)) conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", ip, daemonPort))
if err != nil { if err != nil {
log.Debugf("Daemon not responding yet: ", err) log.Debugf("Daemon not responding yet: %s", err)
return false return false
} }
conn.Close() conn.Close()