docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Added some error messages and tracing to bridge network initialization

Browse Source 
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: a9843cb739bd30a9e6eeb8841f645008e1fc905f
Component: engine
This commit is contained in:
John Gossman
2015-04-11 10:40:37 -07:00
parent 6fd02194d0
commit aeebc69e43
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/daemon/daemon.go
View File

@@ -938,6 +938,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine, registryService
if !config.DisableNetwork {
if err := bridge.InitDriver(&config.Bridge); err != nil {
logrus.Errorf("Error initializing Bridge: %s", err)
return nil, err
}
}

6
components/engine/daemon/networkdriver/bridge/driver.go
View File

@@ -135,8 +135,11 @@ func InitDriver(config *Config) error {
return err
}
logrus.Infof("Bridge interface not found, trying to create it")
// If the iface is not found, try to create it
if err := configureBridge(config.IP, bridgeIPv6, config.EnableIPv6); err != nil {
logrus.Errorf("Could not configure Bridge: %s", err)
return err
}
@@ -214,6 +217,7 @@ func InitDriver(config *Config) error {
// Configure iptables for link support
if config.EnableIptables {
if err := setupIPTables(addrv4, config.InterContainerCommunication, config.EnableIpMasq); err != nil {
logrus.Errorf("Error configuing iptables: %s", err)
return err
}
@@ -261,6 +265,7 @@ func InitDriver(config *Config) error {
}
logrus.Debugf("Subnet: %v", subnet)
if err := ipAllocator.RegisterSubnet(bridgeIPv4Network, subnet); err != nil {
logrus.Errorf("Error registering subnet for IPv4 bridge network: %s", err)
return err
}
}
@@ -272,6 +277,7 @@ func InitDriver(config *Config) error {
}
logrus.Debugf("Subnet: %v", subnet)
if err := ipAllocator.RegisterSubnet(subnet, subnet); err != nil {
logrus.Errorf("Error registering subnet for IPv4 bridge network: %s", err)
return err
}
globalIPv6Network = subnet