Merge pull request #174 from vieux/bind_multiple_hosts

--addr -> multiple -H + unix

README.md

@@ -34,7 +34,7 @@ $ swarm create
 $ swarm join --discovery token://6856663cdefdec325839a4b7e1de38e8 --addr=<node_ip:2375>
 
 # start the manager on any machine or your laptop
-$ swarm manage --discovery token://6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:swarm_port>
+$ swarm manage --discovery token://6856663cdefdec325839a4b7e1de38e8 -H=<swarm_ip:swarm_port>
 
 # use the regular docker cli
 $ docker -H <swarm_ip:swarm_port> info

api/api.go

@@ -2,12 +2,10 @@ package api
 
 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"runtime"
 	"sort"
@@ -322,32 +320,3 @@ func createRouter(c *context, enableCors bool) (*mux.Router, error) {
 
 	return r, nil
 }
-
-func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, addr, version string, enableCors bool, tlsConfig *tls.Config) error {
-	context := &context{
-		cluster:       c,
-		scheduler:     s,
-		version:       version,
-		eventsHandler: NewEventsHandler(),
-	}
-	c.Events(context.eventsHandler)
-	r, err := createRouter(context, enableCors)
-	if err != nil {
-		return err
-	}
-
-	server := &http.Server{
-		Addr:    addr,
-		Handler: r,
-	}
-
-	l, err := net.Listen("tcp", addr)
-	if err != nil {
-		return err
-	}
-	if tlsConfig != nil {
-		tlsConfig.NextProtos = []string{"http/1.1"}
-		l = tls.NewListener(l, tlsConfig)
-	}
-	return server.Serve(l)
-}

api/server.go

@@ -0,0 +1,111 @@
+package api
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+	"syscall"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/swarm/cluster"
+	"github.com/docker/swarm/scheduler"
+)
+
+func newUnixListener(addr string, tlsConfig *tls.Config) (net.Listener, error) {
+	if err := syscall.Unlink(addr); err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+
+	// there is no way to specify the unix rights to use when
+	// creating the socket with net.Listener, so we use umask
+	// to create the file without rights and then we chmod
+	// to the desired unix rights. This prevent unwanted
+	// connections between the creation and the chmod
+	mask := syscall.Umask(0777)
+	defer syscall.Umask(mask)
+
+	l, err := newListener("unix", addr, tlsConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	// only usable by the user who started swarm
+	if err := os.Chmod(addr, 0600); err != nil {
+		return nil, err
+	}
+
+	return l, nil
+}
+
+func newListener(proto, addr string, tlsConfig *tls.Config) (net.Listener, error) {
+	l, err := net.Listen(proto, addr)
+	if err != nil {
+		return nil, err
+	}
+	if tlsConfig != nil {
+		tlsConfig.NextProtos = []string{"http/1.1"}
+		l = tls.NewListener(l, tlsConfig)
+	}
+	return l, nil
+}
+
+func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, hosts []string, version string, enableCors bool, tlsConfig *tls.Config) error {
+	context := &context{
+		cluster:       c,
+		scheduler:     s,
+		version:       version,
+		eventsHandler: NewEventsHandler(),
+	}
+	c.Events(context.eventsHandler)
+	r, err := createRouter(context, enableCors)
+	if err != nil {
+		return err
+	}
+	chErrors := make(chan error, len(hosts))
+
+	for _, host := range hosts {
+		protoAddrParts := strings.SplitN(host, "://", 2)
+		if len(protoAddrParts) == 1 {
+			protoAddrParts = append([]string{"tcp"}, protoAddrParts...)
+		}
+
+		go func() {
+			log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])
+
+			var (
+				l      net.Listener
+				err    error
+				server = &http.Server{
+					Addr:    protoAddrParts[1],
+					Handler: r,
+				}
+			)
+
+			switch protoAddrParts[0] {
+			case "unix":
+				l, err = newUnixListener(protoAddrParts[1], tlsConfig)
+			case "tcp":
+				l, err = newListener("tcp", protoAddrParts[1], tlsConfig)
+			default:
+				err = fmt.Errorf("unsupported protocol: %q", protoAddrParts[0])
+			}
+			if err != nil {
+				chErrors <- err
+			} else {
+				chErrors <- server.Serve(l)
+			}
+
+		}()
+	}
+
+	for i := 0; i < len(hosts); i++ {
+		err := <-chErrors
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

discovery/README.md

@@ -18,7 +18,7 @@ $ swarm create
 $ swarm join --discovery token://6856663cdefdec325839a4b7e1de38e8 --addr=<node_ip:2375>
 
 # start the manager on any machine or your laptop
-$ swarm manage --discovery token://6856663cdefdec325839a4b7e1de38e8 --addr=<swarm_ip:swarm_port>
+$ swarm manage --discovery token://6856663cdefdec325839a4b7e1de38e8 -H=<swarm_ip:swarm_port>
 
 # use the regular docker cli
 $ docker -H <swarm_ip:swarm_port> info
@@ -41,7 +41,7 @@ http://<node_ip:2375>
 $ echo <node_ip:2375> >> /tmp/my_cluster
 
 # start the manager on any machine or your laptop
-$ swarm manage --discovery file:///tmp/my_cluster --addr=<swarm_ip:swarm_port>
+$ swarm manage --discovery file:///tmp/my_cluster -H=<swarm_ip:swarm_port>
 
 # use the regular docker cli
 $ docker -H <swarm_ip:swarm_port> info
@@ -64,7 +64,7 @@ http://<node_ip:2375>
 $ swarm join --discovery etcd://<etcd_ip>/>path> --addr=<node_ip:2375>
 
 # start the manager on any machine or your laptop
-$ swarm manage --discovery etcd://<etcd_ip>/>path> --addr=<swarm_ip:swarm_port>
+$ swarm manage --discovery etcd://<etcd_ip>/>path> -H=<swarm_ip:swarm_port>
 
 # use the regular docker cli
 $ docker -H <swarm_ip:swarm_port> info

flags.go

@@ -15,6 +15,12 @@ var (
 		Usage:  "ip to advertise",
 		EnvVar: "SWARM_ADDR",
 	}
+	flHosts = cli.StringSliceFlag{
+		Name:   "host, H",
+		Value:  &cli.StringSlice{"tcp://127.0.0.1:4243"},
+		Usage:  "ip/socket to listen on",
+		EnvVar: "SWARM_HOST",
+	}
 	flHeartBeat = cli.IntFlag{
 		Name:  "heartbeat, hb",
 		Value: 25,

main.go

@@ -83,7 +83,7 @@ func main() {
 			Usage:     "manage a docker cluster",
 			Flags: []cli.Flag{
 				flStrategy,
-				flDiscovery, flAddr, flHeartBeat,
+				flDiscovery, flHosts, flHeartBeat,
 				flTls, flTlsCaCert, flTlsCert, flTlsKey, flTlsVerify,
 				flEnableCors},
 			Action: manage,

manage.go

@@ -112,5 +112,10 @@ func manage(c *cli.Context) {
 		},
 	)
 
-	log.Fatal(api.ListenAndServe(cluster, sched, c.String("addr"), c.App.Version, c.Bool("cors"), tlsConfig))
+	// see https://github.com/codegangsta/cli/issues/160
+	hosts := c.StringSlice("host")
+	if c.IsSet("host") || c.IsSet("H") {
+		hosts = hosts[1:]
+	}
+	log.Fatal(api.ListenAndServe(cluster, sched, hosts, c.App.Version, c.Bool("cors"), tlsConfig))
 }