Skip to content

Commit

Permalink
leave must not use join options in the defer during failures
Browse files Browse the repository at this point in the history
Signed-off-by: Madhu Venugopal <madhu@docker.com>
  • Loading branch information
mavenugo committed Jun 19, 2015
1 parent 8feadc2 commit b561d4c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down

0 comments on commit b561d4c

Please sign in to comment.