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

Nil check ingressSandbox before deleting

Browse source 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2016-08-25 22:25:16 -07:00
parent 24f44d9732
commit 9041996509
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnetwork/controller.go
View file

@ -320,14 +320,17 @@ func (c *controller) clusterAgentInit() {
c.agentClose() c.agentClose()
c.cleanupServiceBindings("") c.cleanupServiceBindings("")
if err := c.ingressSandbox.Delete(); err != nil {
log.Warnf("Could not delete ingress sandbox while leaving: %v", err)
}
c.Lock() c.Lock()
ingressSandbox := c.ingressSandbox
c.ingressSandbox = nil c.ingressSandbox = nil
c.Unlock() c.Unlock()
if ingressSandbox != nil {
if err := ingressSandbox.Delete(); err != nil {
log.Warnf("Could not delete ingress sandbox while leaving: %v", err)
}
}
n, err := c.NetworkByName("ingress") n, err := c.NetworkByName("ingress")
if err != nil { if err != nil {
log.Warnf("Could not find ingress network while leaving: %v", err) log.Warnf("Could not find ingress network while leaving: %v", err)