Merge pull request #1634 from aboch/err

Report failure in subscribing to neighbor notifications
This commit is contained in:
Santhosh Manohar 2017-02-07 10:58:35 -08:00 committed by GitHub
commit f4eec45e45

View file

@ -612,13 +612,13 @@ func (n *network) initSandbox(restore bool) error {
var nlSock *nl.NetlinkSocket var nlSock *nl.NetlinkSocket
sbox.InvokeFunc(func() { sbox.InvokeFunc(func() {
nlSock, err = nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_NEIGH) nlSock, err = nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_NEIGH)
if err != nil {
err = fmt.Errorf("failed to subscribe to neighbor group netlink messages")
}
}) })
if nlSock != nil { if err == nil {
go n.watchMiss(nlSock) go n.watchMiss(nlSock)
} else {
logrus.Errorf("failed to subscribe to neighbor group netlink messages for overlay network %s in sbox %s: %v",
n.id, sbox.Key(), err)
} }
return nil return nil