appease linter

This commit is contained in:
Matthias Radestock committed 2016-01-02 12:35:10 +00:00
1 parent d59594c6b0
commit 75d9e95b15
6 files changed
+36 -37

No files matched your search

+3 -3
View File
@@ -63,11 +63,11 @@ func (c *Client) checkWorking() error {
}
func (c *Client) Info() string {
if env, err := c.Version(); err != nil {
env, err := c.Version()
if err != nil {
return fmt.Sprintf("Docker API error: %s", err)
} else {
return fmt.Sprintf("Docker API on %s: %v", c.Endpoint(), env)
}
return fmt.Sprintf("Docker API on %s: %v", c.Endpoint(), env)
}
// AddObserver adds an observer for docker events
+7 -7
View File
@@ -10,28 +10,28 @@ import (
// ODP admin functionality
func CreateDatapath(dpname string) (err error, supported bool) {
func CreateDatapath(dpname string) (supported bool, err error) {
dpif, err := odp.NewDpif()
if err != nil {
if odp.IsKernelLacksODPError(err) {
return nil, false
return false, nil
}
return err, true
return true, err
}
defer dpif.Close()
dp, err := dpif.CreateDatapath(dpname)
if err != nil && !odp.IsDatapathNameAlreadyExistsError(err) {
return err, true
return true, err
}
// Pick an ephemeral port number to use in probing for vxlan
// support.
udpconn, err := net.ListenUDP("udp4", nil)
if err != nil {
return err, true
return true, err
}
// we leave the UDP socket open, so creating a vxlan vport on
@@ -43,7 +43,7 @@ func CreateDatapath(dpname string) (err error, supported bool) {
if nlerr, ok := err.(odp.NetlinkError); ok {
if syscall.Errno(nlerr) == syscall.EAFNOSUPPORT {
dp.Delete()
return fmt.Errorf("kernel does not have Open vSwitch VXLAN support"), false
return false, fmt.Errorf("kernel does not have Open vSwitch VXLAN support")
}
}
@@ -52,7 +52,7 @@ func CreateDatapath(dpname string) (err error, supported bool) {
}
udpconn.Close()
return nil, true
return true, nil
}
func DeleteDatapath(dpname string) error {