Merge pull request #1143 from travisturner/scheme-in-bind-addr

handle the scheme correctly in config.Bind

gossip/gossip.go

@@ -19,7 +19,6 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"net"
 	"os"
 	"strconv"
 	"strings"
@@ -159,10 +158,12 @@ func NewGossipMemberSetWithTransport(name string, cfg *pilosa.Config, transport
 	}
 
 	port := transport.Net.GetAutoBindPort()
-	host, _, err := net.SplitHostPort(cfg.Bind)
+
+	bindURI, err := pilosa.NewURIFromAddress(cfg.Bind)
 	if err != nil {
-		return nil, fmt.Errorf("split host port: %s", err)
+		return nil, fmt.Errorf("getting uri from bind address (with transport): %s", err)
 	}
+	host := bindURI.Host()
 
 	var gossipKey []byte
 	if cfg.Gossip.Key != "" {
@@ -215,10 +216,12 @@ func NewGossipMemberSet(name string, cfg *pilosa.Config, server *pilosa.Server)
 	if err != nil {
 		return nil, fmt.Errorf("convert port: %s", err)
 	}
-	host, _, err := net.SplitHostPort(cfg.Bind)
+
+	bindURI, err := pilosa.NewURIFromAddress(cfg.Bind)
 	if err != nil {
-		return nil, fmt.Errorf("split host port: %s", err)
+		return nil, fmt.Errorf("getting uri from bind address: %s", err)
 	}
+	host := bindURI.Host()
 
 	// Set up the transport.
 	transport, err := NewTransport(host, port)

test/pilosa.go

@@ -50,7 +50,7 @@ func NewMain() *Main {
 	m := &Main{Command: server.NewCommand(os.Stdin, os.Stdout, os.Stderr)}
 	m.Server.Network = *Network
 	m.Config.DataDir = path
-	m.Config.Bind = "localhost:0"
+	m.Config.Bind = "http://localhost:0"
 	m.Config.Cluster.Disabled = true
 	m.Command.Stdin = &m.Stdin
 	m.Command.Stdout = &m.Stdout