Merge pull request #26 from arangodb-helper/up-info

Show user friendly address to reach the coordinator

Author: ewoutp

service/arangodb.go

@@ -430,9 +430,28 @@ func (s *Service) startRunning(runner Runner) {
 			*processVar = p
 			ctx, cancel := context.WithCancel(s.ctx)
 			go func() {
-				if up, cancelled := s.testInstance(ctx, myHost, s.MasterPort+portOffset+serverPortOffset); !cancelled {
+				port := s.MasterPort + portOffset + serverPortOffset
+				if up, cancelled := s.testInstance(ctx, myHost, port); !cancelled {
 					if up {
 						s.log.Infof("%s up and running.", mode)
+						if mode == "coordinator" {
+							hostPort, err := p.HostPort(port)
+							if err != nil {
+								if id := p.ContainerID(); id != "" {
+									s.log.Infof("%s can only be accessed from inside a container.", mode)
+								}
+							} else {
+								scheme := "http"
+								arangoshScheme := "tcp"
+								if myPeer.IsSecure {
+									scheme = "https"
+									arangoshScheme = "ssl"
+								}
+								ip := myPeer.Address
+								s.log.Infof("Your cluster can now be accessed with a browser at `%s://%s:%d` or", scheme, ip, hostPort)
+								s.log.Infof("using `arangosh --server.endpoint %s://%s:%d`.", arangoshScheme, ip, hostPort)
+							}
+						}
 					} else {
 						s.log.Warningf("%s not ready after 5min!", mode)
 					}

service/runner.go

@@ -32,6 +32,8 @@ type Process interface {
 	ContainerID() string
 	// ContainerIP returns the IP address of the docker container that runs the process.
 	ContainerIP() string
+	// HostPort returns the port on the host that is used to access the given port of the process.
+	HostPort(containerPort int) (int, error)
 
 	// Wait until the process has terminated
 	Wait()

service/runner_docker.go

@@ -370,6 +370,20 @@ func (p *dockerContainer) ContainerIP() string {
 	return ""
 }
 
+// HostPort returns the port on the host that is used to access the given port of the process.
+func (p *dockerContainer) HostPort(containerPort int) (int, error) {
+	if hostConfig := p.container.HostConfig; hostConfig != nil {
+		if hostConfig.NetworkMode == "host" {
+			return containerPort, nil
+		}
+		dockerPort := docker.Port(fmt.Sprintf("%d/tcp", containerPort))
+		if binding, ok := hostConfig.PortBindings[dockerPort]; ok && len(binding) > 0 {
+			return strconv.Atoi(binding[0].HostPort)
+		}
+	}
+	return 0, fmt.Errorf("Cannot find port mapping.")
+}
+
 func (p *dockerContainer) Wait() {
 	p.client.WaitContainer(p.container.ID)
 }

service/runner_process.go

@@ -111,6 +111,11 @@ func (p *process) ContainerIP() string {
 	return ""
 }
 
+// HostPort returns the port on the host that is used to access the given port of the process.
+func (p *process) HostPort(containerPort int) (int, error) {
+	return containerPort, nil
+}
+
 func (p *process) Wait() {
 	if proc := p.p; proc != nil {
 		p.log.Debugf("Waiting on %d", proc.Pid)