add support for port range in http broker

This commit is contained in:
Asim Aslam
2017-01-12 14:11:25 +00:00
parent a47d916b50
commit 66ef6b67ca
2 changed files with 34 additions and 66 deletions

View File

@@ -5,19 +5,17 @@ import (
"bytes"
"crypto/tls"
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"net"
"net/http"
"net/url"
"strconv"
"strings"
"sync"
"time"
maddr "github.com/micro/misc/lib/addr"
mnet "github.com/micro/misc/lib/net"
mls "github.com/micro/misc/lib/tls"
)
@@ -57,58 +55,6 @@ type httpTransportListener struct {
listener net.Listener
}
func listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, error) {
// host:port || host:min-max
parts := strings.Split(addr, ":")
//
if len(parts) < 2 {
return fn(addr)
}
// try to extract port range
ports := strings.Split(parts[len(parts)-1], "-")
// single port
if len(ports) < 2 {
return fn(addr)
}
// we have a port range
// extract min port
min, err := strconv.Atoi(ports[0])
if err != nil {
return nil, errors.New("unable to extract port range")
}
// extract max port
max, err := strconv.Atoi(ports[1])
if err != nil {
return nil, errors.New("unable to extract port range")
}
// set host
host := parts[:len(parts)-1]
// range the ports
for port := min; port <= max; port++ {
// try bind to host:port
ln, err := fn(fmt.Sprintf("%s:%d", host, port))
if err == nil {
return ln, nil
}
// hit max port
if port == max {
return nil, err
}
}
// why are we here?
return nil, fmt.Errorf("unable to bind to %s", addr)
}
func (b *buffer) Close() error {
return nil
}
@@ -457,13 +403,13 @@ func (h *httpTransport) Listen(addr string, opts ...ListenOption) (Listener, err
return tls.Listen("tcp", addr, config)
}
l, err = listen(addr, fn)
l, err = mnet.Listen(addr, fn)
} else {
fn := func(addr string) (net.Listener, error) {
return net.Listen("tcp", addr)
}
l, err = listen(addr, fn)
l, err = mnet.Listen(addr, fn)
}
if err != nil {