libmachine/drivers/rpc: close plugin binary even when driver server fails

andrestc · andrestc · commit 02428eeb06d6 · 2016-11-21T14:31:22.000-02:00
With this commit the RPC client driver tries closing the plugin binary
even when closing the driver server fails. This prevents the driver
process from entering in &lt;defunct&gt; state when it failed before closing.

Signed-off-by: André Carvalho &lt;asantostc@gmail.com&gt;
diff --git a/libmachine/drivers/rpc/client_driver.go b/libmachine/drivers/rpc/client_driver.go
@@ -213,10 +213,11 @@ func (c *RPCClientDriver) close() error {
 	log.Debug("Making call to close driver server")
 
 	if err := c.Client.Call(CloseMethod, struct{}{}, nil); err != nil {
-		return err
+		log.Debugf("Failed to make call to close driver server: %s", err)
+	} else {
+		log.Debug("Successfully made call to close driver server")
 	}
 
-	log.Debug("Successfully made call to close driver server")
 	log.Debug("Making call to close connection to plugin binary")
 
 	return c.plugin.Close()
