Merge pull request #7055 from coheyxyz/break-loop

Break loop correctly
This commit is contained in:
unclejack 2014-07-17 18:20:12 +03:00
commit dca52c47a4
1 changed files with 2 additions and 3 deletions

View File

@ -415,8 +415,7 @@ func AllocatePort(job *engine.Job) engine.Status {
break break
} }
switch allocerr := err.(type) { if allocerr, ok := err.(portallocator.ErrPortAlreadyAllocated); ok {
case portallocator.ErrPortAlreadyAllocated:
// There is no point in immediately retrying to map an explicitly // There is no point in immediately retrying to map an explicitly
// chosen port. // chosen port.
if hostPort != 0 { if hostPort != 0 {
@ -426,7 +425,7 @@ func AllocatePort(job *engine.Job) engine.Status {
// Automatically chosen 'free' port failed to bind: move on the next. // Automatically chosen 'free' port failed to bind: move on the next.
job.Logf("Failed to bind %s for container address %s. Trying another port.", allocerr.IPPort(), container.String()) job.Logf("Failed to bind %s for container address %s. Trying another port.", allocerr.IPPort(), container.String())
default: } else {
// some other error during mapping // some other error during mapping
job.Logf("Received an unexpected error during port allocation: %s", err.Error()) job.Logf("Received an unexpected error during port allocation: %s", err.Error())
break break