From 1f398f06aa4c533d933bb7335bd9f5047673d7c6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 24 Sep 2020 10:59:00 +0200 Subject: [PATCH] portallocator: minor refactor for readability Signed-off-by: Sebastiaan van Stijn --- libnetwork/portallocator/portallocator.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libnetwork/portallocator/portallocator.go b/libnetwork/portallocator/portallocator.go index e5adb709fc..30323fe927 100644 --- a/libnetwork/portallocator/portallocator.go +++ b/libnetwork/portallocator/portallocator.go @@ -35,7 +35,6 @@ var ( defaultIP = net.ParseIP("0.0.0.0") once sync.Once instance *PortAllocator - createInstance = func() { instance = newInstance() } ) // ErrPortAlreadyAllocated is the returned error information when a requested port is already being used @@ -99,7 +98,9 @@ func Get() *PortAllocator { // the OS so that it can have up to date view of the OS port allocation. // When this happens singleton behavior will be removed. Clients do not // need to worry about this, they will not see a change in behavior. - once.Do(createInstance) + once.Do(func() { + instance = newInstance() + }) return instance } @@ -199,15 +200,10 @@ func (p *PortAllocator) SetPortRange(portBegin, portEnd int) error { var err error if portBegin == 0 && portEnd == 0 { begin, end = getDefaultPortRange() - - } else { - begin, end, err = sanitizePortRange(portBegin, portEnd) - if err != nil { - return err - } + } else if begin, end, err = sanitizePortRange(portBegin, portEnd); err != nil { + return err } - logrus.Debugf("Setting up port allocator to range %v-%v, current %v-%v", - begin, end, p.Begin, p.End) + logrus.Debugf("Setting up port allocator to range %v-%v, current %v-%v", begin, end, p.Begin, p.End) p.mutex.Lock() defer p.mutex.Unlock() if p.Begin == begin && p.End == end {