mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #323 from mavenugo/master
leave must not use join options in the defer during failures
This commit is contained in:
commit
1da7a34862
1 changed files with 1 additions and 1 deletions
|
@ -350,7 +350,7 @@ func (ep *endpoint) Join(containerID string, options ...EndpointOption) error {
|
|||
defer func() {
|
||||
ep.joinLeaveEnd()
|
||||
if err != nil {
|
||||
if e := ep.Leave(containerID, options...); e != nil {
|
||||
if e := ep.Leave(containerID); e != nil {
|
||||
log.Warnf("couldnt leave endpoint : %v", ep.name, err)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue