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

Updating to the new ep.Delete API

Browse source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2016-01-12 11:36:48 -08:00
parent 537089481f
commit 8edbd10349
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/container_operations_unix.go
View file

@ -784,7 +784,7 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
}
defer func() {
if err != nil {
if e := ep.Delete(); e != nil {
if e := ep.Delete(false); e != nil {
logrus.Warnf("Could not rollback container connection to network %s", idOrName)
}
}
@ -881,7 +881,7 @@ func disconnectFromNetwork(container *container.Container, n libnetwork.Network)
return fmt.Errorf("container %s failed to leave network %s: %v", container.ID, n.Name(), err)
}
if err := ep.Delete(); err != nil {
if err := ep.Delete(false); err != nil {
return fmt.Errorf("endpoint delete failed for container %s on network %s: %v", container.ID, n.Name(), err)
}