Merge pull request docker-archive-public#2931 from dgageot/remove-annoying-log

jeanlaurent · jeanlaurent · commit 7f708edcec8c · 2016-01-26T17:33:50.000+01:00
Remove spurious log that adds no value and make ITs fail sometimes because of an additional line
diff --git a/libmachine/drivers/rpc/client_driver.go b/libmachine/drivers/rpc/client_driver.go
@@ -109,7 +109,8 @@ func (f *DefaultRPCClientDriverFactory) Close() error {
 
 	for _, openedDriver := range f.openedDrivers {
 		if err := openedDriver.close(); err != nil {
-			log.Warnf("Error closing a plugin driver: %s", err)
+			// No need to display an error.
+			// There's nothing we can do and it doesn't add value to the user.
 		}
 	}
 	f.openedDrivers = []*RPCClientDriver{}
@@ -213,14 +214,9 @@ func (c *RPCClientDriver) close() error {
 	}
 
 	log.Debug("Successfully made call to close driver server")
-
 	log.Debug("Making call to close connection to plugin binary")
 
-	if err := c.plugin.Close(); err != nil {
-		return err
-	}
-
-	return nil
+	return c.plugin.Close()
 }
 
 // Helper method to make requests which take no arguments and return simply a

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ func (f *DefaultRPCClientDriverFactory) Close() error {`
`109`	`109`
`110`	`110`	`for _, openedDriver := range f.openedDrivers {`
`111`	`111`	`if err := openedDriver.close(); err != nil {`
`112`		`- log.Warnf("Error closing a plugin driver: %s", err)`
	`112`	`+ // No need to display an error.`
	`113`	`+ // There's nothing we can do and it doesn't add value to the user.`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`	`f.openedDrivers = []*RPCClientDriver{}`
`@@ -213,14 +214,9 @@ func (c *RPCClientDriver) close() error {`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`log.Debug("Successfully made call to close driver server")`
`216`		`-`
`217`	`217`	`log.Debug("Making call to close connection to plugin binary")`
`218`	`218`
`219`		`- if err := c.plugin.Close(); err != nil {`
`220`		`- return err`
`221`		`- }`
`222`		`-`
`223`		`- return nil`
	`219`	`+ return c.plugin.Close()`
`224`	`220`	`}`
`225`	`221`
`226`	`222`	`// Helper method to make requests which take no arguments and return simply a`