Merge pull request docker-archive-public#2427 from newpcraft/debugmsg_in_daemonresponding

jeanlaurent · jeanlaurent · commit 48554182f13b · 2015-11-30T09:56:29.000+01:00
add debug message in dockerDaemonResponding function due to helping f…
diff --git a/libmachine/provision/arch.go b/libmachine/provision/arch.go
@@ -76,8 +76,11 @@ func (provisioner *ArchProvisioner) Package(name string, action pkgaction.Packag
 }
 
 func (provisioner *ArchProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 
diff --git a/libmachine/provision/debian.go b/libmachine/provision/debian.go
@@ -91,8 +91,11 @@ func (provisioner *DebianProvisioner) Package(name string, action pkgaction.Pack
 }
 
 func (provisioner *DebianProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 
diff --git a/libmachine/provision/redhat.go b/libmachine/provision/redhat.go
@@ -140,8 +140,11 @@ func (provisioner *RedHatProvisioner) installOfficialDocker() error {
 }
 
 func (provisioner *RedHatProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 
diff --git a/libmachine/provision/suse.go b/libmachine/provision/suse.go
@@ -127,8 +127,11 @@ func (provisioner *SUSEProvisioner) Package(name string, action pkgaction.Packag
 }
 
 func (provisioner *SUSEProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 
diff --git a/libmachine/provision/ubuntu_systemd.go b/libmachine/provision/ubuntu_systemd.go
@@ -107,8 +107,11 @@ func (provisioner *UbuntuSystemdProvisioner) Package(name string, action pkgacti
 }
 
 func (provisioner *UbuntuSystemdProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 
diff --git a/libmachine/provision/ubuntu_upstart.go b/libmachine/provision/ubuntu_upstart.go
@@ -126,8 +126,11 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
 }
 
 func (provisioner *UbuntuProvisioner) dockerDaemonResponding() bool {
-	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
+	log.Debug("checking docker daemon")
+
+	if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {
 		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Debugf("'sudo docker version' output:\n%s", out)
 		return false
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,11 @@ func (provisioner *ArchProvisioner) Package(name string, action pkgaction.Packag`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func (provisioner *ArchProvisioner) dockerDaemonResponding() bool {`
`79`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`79`	`+ log.Debug("checking docker daemon")`
	`80`	`+`
	`81`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`80`	`82`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`83`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`81`	`84`	`return false`
`82`	`85`	`}`
`83`	`86`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,11 @@ func (provisioner *DebianProvisioner) Package(name string, action pkgaction.Pack`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func (provisioner *DebianProvisioner) dockerDaemonResponding() bool {`
`94`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`94`	`+ log.Debug("checking docker daemon")`
	`95`	`+`
	`96`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`95`	`97`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`98`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`96`	`99`	`return false`
`97`	`100`	`}`
`98`	`101`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,11 @@ func (provisioner *RedHatProvisioner) installOfficialDocker() error {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func (provisioner *RedHatProvisioner) dockerDaemonResponding() bool {`
`143`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`143`	`+ log.Debug("checking docker daemon")`
	`144`	`+`
	`145`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`144`	`146`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`147`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`145`	`148`	`return false`
`146`	`149`	`}`
`147`	`150`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,11 @@ func (provisioner *SUSEProvisioner) Package(name string, action pkgaction.Packag`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func (provisioner *SUSEProvisioner) dockerDaemonResponding() bool {`
`130`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`130`	`+ log.Debug("checking docker daemon")`
	`131`	`+`
	`132`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`131`	`133`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`134`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`132`	`135`	`return false`
`133`	`136`	`}`
`134`	`137`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,11 @@ func (provisioner *UbuntuSystemdProvisioner) Package(name string, action pkgacti`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (provisioner *UbuntuSystemdProvisioner) dockerDaemonResponding() bool {`
`110`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`110`	`+ log.Debug("checking docker daemon")`
	`111`	`+`
	`112`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`111`	`113`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`114`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`112`	`115`	`return false`
`113`	`116`	`}`
`114`	`117`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,11 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`func (provisioner *UbuntuProvisioner) dockerDaemonResponding() bool {`
`129`		`- if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
	`129`	`+ log.Debug("checking docker daemon")`
	`130`	`+`
	`131`	`+ if out, err := provisioner.SSHCommand("sudo docker version"); err != nil {`
`130`	`132`	`log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)`
	`133`	`+ log.Debugf("'sudo docker version' output:\n%s", out)`
`131`	`134`	`return false`
`132`	`135`	`}`
`133`	`136`