kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #12300 from johngossman/master

Browse source 
Added some error messages and tracing to bridge network initialization
This commit is contained in:
Evan Hazlett 2015-04-13 14:32:56 -04:00
commit 3434f64827
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

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

6
daemon/networkdriver/bridge/driver.go
View file

@ -135,8 +135,11 @@ func InitDriver(config *Config) error {
return err
}
logrus.Info("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 IPv6 bridge network: %s", err)
return err
}
globalIPv6Network = subnet