Add more logs, specially for windows users

dgageot · dgageot · commit b6b99747bfaa · 2016-01-25T15:02:30.000+01:00
Signed-off-by: David Gageot &lt;david@gageot.net&gt;
diff --git a/drivers/virtualbox/network.go b/drivers/virtualbox/network.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"runtime"
+
 	"github.com/docker/machine/libmachine/log"
 )
 
@@ -49,6 +51,10 @@ func (n *hostOnlyNetwork) Save(vbox VBoxManager) error {
 // SaveIPv4 changes the ipv4 configuration of the host-only network.
 func (n *hostOnlyNetwork) SaveIPv4(vbox VBoxManager) error {
 	if n.IPv4.IP != nil && n.IPv4.Mask != nil {
+		if runtime.GOOS == "windows" {
+			log.Warn("Windows might ask for the permission to configure a network adapter. Sometimes, such confirmation window is minimized in the taskbar.")
+		}
+
 		if err := vbox.vbm("hostonlyif", "ipconfig", n.Name, "--ip", n.IPv4.IP.String(), "--netmask", net.IP(n.IPv4.Mask).String()); err != nil {
 			return err
 		}
@@ -59,6 +65,10 @@ func (n *hostOnlyNetwork) SaveIPv4(vbox VBoxManager) error {
 
 // createHostonlyAdapter creates a new host-only network.
 func createHostonlyAdapter(vbox VBoxManager) (*hostOnlyNetwork, error) {
+	if runtime.GOOS == "windows" {
+		log.Warn("Windows might ask for the permission to create a network adapter. Sometimes, such confirmation window is minimized in the taskbar.")
+	}
+
 	out, err := vbox.vbmOut("hostonlyif", "create")
 	if err != nil {
 		return nil, err
@@ -226,6 +236,8 @@ func removeOrphanDHCPServers(vbox VBoxManager) error {
 		return nil
 	}
 
+	log.Debug("Removing orphan DHCP servers...")
+
 	nets, err := listHostOnlyAdapters(vbox)
 	if err != nil {
 		return err
@@ -277,6 +289,10 @@ func addHostOnlyDHCPServer(ifname string, d dhcpServer, vbox VBoxManager) error
 		args = append(args, "--disable")
 	}
 
+	if runtime.GOOS == "windows" {
+		log.Warn("Windows might ask for the permission to configure a dhcp server. Sometimes, such confirmation window is minimized in the taskbar.")
+	}
+
 	return vbox.vbm(args...)
 }
 
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
@@ -478,7 +478,8 @@ func (d *Driver) Start() error {
 
 	var hostOnlyAdapter *hostOnlyNetwork
 	if s == state.Stopped {
-		// check network to re-create if needed
+		log.Infof("Check network to re-create if needed...")
+
 		if hostOnlyAdapter, err = d.setupHostOnlyNetwork(d.MachineName); err != nil {
 			return fmt.Errorf("Error setting up host only network on machine start: %s", err)
 		}
@@ -715,7 +716,6 @@ func (d *Driver) setupHostOnlyNetwork(machineName string) (*hostOnlyNetwork, err
 		return nil, err
 	}
 
-	log.Debug("Removing orphan DHCP servers...")
 	if err := removeOrphanDHCPServers(d.VBoxManager); err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,8 @@ func (d *Driver) Start() error {`
`478`	`478`
`479`	`479`	`var hostOnlyAdapter *hostOnlyNetwork`
`480`	`480`	`if s == state.Stopped {`
`481`		`- // check network to re-create if needed`
	`481`	`+ log.Infof("Check network to re-create if needed...")`
	`482`	`+`
`482`	`483`	`if hostOnlyAdapter, err = d.setupHostOnlyNetwork(d.MachineName); err != nil {`
`483`	`484`	`return fmt.Errorf("Error setting up host only network on machine start: %s", err)`
`484`	`485`	`}`
`@@ -715,7 +716,6 @@ func (d Driver) setupHostOnlyNetwork(machineName string) (hostOnlyNetwork, err`
`715`	`716`	`return nil, err`
`716`	`717`	`}`
`717`	`718`
`718`		`- log.Debug("Removing orphan DHCP servers...")`
`719`	`719`	`if err := removeOrphanDHCPServers(d.VBoxManager); err != nil {`
`720`	`720`	`return nil, err`
`721`	`721`	`}`