Protect container-addrs against stopped containers

This commit is contained in:
Adam Harrison committed 2016-03-18 10:46:30 +00:00
1 parent 4b5fb2785e
commit f9f6e8ed26
2 files changed
+8

No files matched your search

+4
View File
@@ -4,6 +4,7 @@ import (
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
"net"
"os"
"runtime"
"strings"
)
@@ -53,6 +54,9 @@ func FindNetDevs(processID int, match func(string) bool) ([]NetDev, error) {
ns, err := netns.GetFromPid(processID)
if err != nil {
if os.IsNotExist(err) {
return nil, nil
}
return nil, err
}
defer ns.Close()
+4
View File
@@ -49,5 +49,9 @@ func getNetDevs(bridgeName string, c *docker.Client, containerID string) ([]comm
return nil, err
}
if container.State.Pid == 0 {
return nil, nil
}
return common.GetWeaveNetDevs(container.State.Pid)
}