Browse Source

fix typo in comments and log

Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud 9 years ago
parent
commit
d69747e19e

+ 1 - 1
libnetwork/controller.go

@@ -97,7 +97,7 @@ type NetworkController interface {
 	// Sandboxes returns the list of Sandbox(s) managed by this controller.
 	// Sandboxes returns the list of Sandbox(s) managed by this controller.
 	Sandboxes() []Sandbox
 	Sandboxes() []Sandbox
 
 
-	// WlakSandboxes uses the provided function to walk the Sandbox(s) managed by this controller.
+	// WalkSandboxes uses the provided function to walk the Sandbox(s) managed by this controller.
 	WalkSandboxes(walker SandboxWalker)
 	WalkSandboxes(walker SandboxWalker)
 
 
 	// SandboxByID returns the Sandbox which has the passed id. If not found, a types.NotFoundError is returned.
 	// SandboxByID returns the Sandbox which has the passed id. If not found, a types.NotFoundError is returned.

+ 2 - 2
libnetwork/default_gateway.go

@@ -14,7 +14,7 @@ const (
 var procGwNetwork = make(chan (bool), 1)
 var procGwNetwork = make(chan (bool), 1)
 
 
 /*
 /*
-   libnetwork creates a bridge network "docker_gw_bridge" for provding
+   libnetwork creates a bridge network "docker_gw_bridge" for providing
    default gateway for the containers if none of the container's endpoints
    default gateway for the containers if none of the container's endpoints
    have GW set by the driver. ICC is set to false for the GW_bridge network.
    have GW set by the driver. ICC is set to false for the GW_bridge network.
 
 
@@ -29,7 +29,7 @@ var procGwNetwork = make(chan (bool), 1)
 
 
 func (sb *sandbox) setupDefaultGW() error {
 func (sb *sandbox) setupDefaultGW() error {
 
 
-	// check if the conitainer already has a GW endpoint
+	// check if the container already has a GW endpoint
 	if ep := sb.getEndpointInGWNetwork(); ep != nil {
 	if ep := sb.getEndpointInGWNetwork(); ep != nil {
 		return nil
 		return nil
 	}
 	}

+ 1 - 1
libnetwork/drivers/bridge/bridge.go

@@ -564,7 +564,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d
 	}
 	}
 	d.Unlock()
 	d.Unlock()
 
 
-	// Parse and validate the config. It should not conflict with existing networks' config
+	// Parse and validate the config. It should not be conflict with existing networks' config
 	config, err := parseNetworkOptions(id, option)
 	config, err := parseNetworkOptions(id, option)
 	if err != nil {
 	if err != nil {
 		return err
 		return err

+ 1 - 1
libnetwork/network.go

@@ -1206,7 +1206,7 @@ func (n *network) requestPoolHelper(ipam ipamapi.Ipam, addressSpace, preferredPo
 		}()
 		}()
 
 
 		// If this is a preferred pool request and the network
 		// If this is a preferred pool request and the network
-		// is local scope and there is a overlap, we fail the
+		// is local scope and there is an overlap, we fail the
 		// network creation right here. The pool will be
 		// network creation right here. The pool will be
 		// released in the defer.
 		// released in the defer.
 		if preferredPool != "" {
 		if preferredPool != "" {

+ 2 - 2
libnetwork/service_linux.go

@@ -316,7 +316,7 @@ func (sb *sandbox) addLBBackend(ip, vip net.IP, fwMark uint32, ingressPorts []*P
 
 
 	i, err := ipvs.New(sb.Key())
 	i, err := ipvs.New(sb.Key())
 	if err != nil {
 	if err != nil {
-		logrus.Errorf("Failed to create a ipvs handle for sbox %s: %v", sb.Key(), err)
+		logrus.Errorf("Failed to create an ipvs handle for sbox %s: %v", sb.Key(), err)
 		return
 		return
 	}
 	}
 	defer i.Close()
 	defer i.Close()
@@ -371,7 +371,7 @@ func (sb *sandbox) rmLBBackend(ip, vip net.IP, fwMark uint32, ingressPorts []*Po
 
 
 	i, err := ipvs.New(sb.Key())
 	i, err := ipvs.New(sb.Key())
 	if err != nil {
 	if err != nil {
-		logrus.Errorf("Failed to create a ipvs handle for sbox %s: %v", sb.Key(), err)
+		logrus.Errorf("Failed to create an ipvs handle for sbox %s: %v", sb.Key(), err)
 		return
 		return
 	}
 	}
 	defer i.Close()
 	defer i.Close()