Closes #32

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

.dockerignore

@@ -1,5 +1,2 @@
-Dockerfile
-*_test.go
-**/*_test.go
-*.md
-**/*.md
+vendor
+website

Gopkg.lock

@@ -60,3 +60,11 @@
 [[constraint]]
   branch = "master"
   name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "github.com/coreos/etcd"
+  version = "3.2.14"
+
+[[constraint]]
+  name = "github.com/hashicorp/serf"
+  version = "0.7.0"

Gopkg.toml

@@ -1,6 +1,8 @@
-package api
+package admin
 
 import (
+	"net/http"
+
 	"github.com/labstack/armor"
 	"github.com/labstack/armor/plugin"
 	"github.com/labstack/echo"
@@ -10,12 +12,29 @@ type (
 	handler struct {
 		armor *armor.Armor
 	}
+
+	Node struct {
+		Name string `json:"name"`
+	}
 )
 
 func (h *handler) getPath(c echo.Context) string {
 	return "/" + c.Param("path")
 }
 
+func (h *handler) nodes(c echo.Context) error {
+	serf := h.armor.Cluster.Serf
+	nodes := []*Node{}
+
+	for _, m := range serf.Members() {
+		nodes = append(nodes, &Node{
+			Name: m.Name,
+		})
+	}
+
+	return c.JSON(http.StatusOK, nodes)
+}
+
 func (h *handler) lookupPlugin(host *armor.Host, path *armor.Path, plugin string) (p armor.Plugin) {
 	plugins := []armor.Plugin{}
 

admin/api/handler.go renamed to admin/handler.go

@@ -1,4 +1,4 @@
-package api
+package admin
 
 import (
 	"github.com/labstack/armor"
@@ -14,6 +14,10 @@ func Start(a *armor.Armor) {
 	}))
 	h := &handler{armor: a}
 
+	// Nodes
+	nodes := e.Group("/nodes")
+	nodes.GET("", h.nodes)
+
 	// Global
 
 	// Hosts
@@ -40,5 +44,5 @@ func Start(a *armor.Armor) {
 	pathPlugins.POST("/targets", h.addProxyTarget)
 	pathPlugins.DELETE("/targets/:target", h.removeProxyTarget)
 
-	e.Start(":8081")
+	e.Start(a.Admin.Address)
 }

admin/api/server.go renamed to admin/server.go

@@ -4,6 +4,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/serf/serf"
+
 	"github.com/labstack/echo"
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
@@ -12,8 +14,12 @@ import (
 type (
 	Armor struct {
 		mutex        sync.RWMutex
+		Name         string        `yaml:"name"`
 		Address      string        `yaml:"address"`
 		TLS          *TLS          `yaml:"tls"`
+		Admin        *Admin        `yaml:"admin"`
+		Cockroach    *Cockroach    `yaml:"cockroach"`
+		Cluster      *Cluster      `yaml:"cluster"`
 		ReadTimeout  time.Duration `yaml:"read_timeout"`
 		WriteTimeout time.Duration `yaml:"write_timeout"`
 		RawPlugins   []RawPlugin   `yaml:"plugins"`
@@ -33,6 +39,20 @@ type (
 		Email    string `yaml:"email"`
 	}
 
+	Admin struct {
+		Address string `yaml:"address"`
+	}
+
+	Cockroach struct {
+		URI string `yaml:"uri"`
+	}
+
+	Cluster struct {
+		Address string   `yaml:"address"`
+		Peers   []string `yaml:"peers"`
+		Serf    *serf.Serf
+	}
+
 	Host struct {
 		mutex      sync.RWMutex
 		Name       string      `yaml:"-"`

armor.go

@@ -0,0 +1,54 @@
+package cluster
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"os"
+	"strconv"
+
+	"github.com/hashicorp/logutils"
+	"github.com/hashicorp/serf/serf"
+	"github.com/labstack/armor"
+)
+
+func Start(a *armor.Armor) {
+	conf := serf.DefaultConfig()
+	filter := &logutils.LevelFilter{
+		Levels:   []logutils.LogLevel{"DEBUG", "INFO", "WARN", "ERROR"},
+		MinLevel: logutils.LogLevel("WARN"),
+		Writer:   os.Stderr,
+	}
+	conf.MemberlistConfig.Logger = log.New(filter, "", log.LstdFlags)
+	conf.LogOutput = filter
+	conf.NodeName = a.Name
+	host, port, err := net.SplitHostPort(a.Cluster.Address)
+	if err != nil {
+		a.Logger.Fatal(err)
+	}
+	if host == "" {
+		host = "127.0.0.1"
+	}
+	p, err := strconv.Atoi(port)
+	if err != nil {
+		a.Logger.Fatal(err)
+	}
+	conf.MemberlistConfig.BindAddr = host
+	conf.MemberlistConfig.BindPort = p
+	a.Cluster.Serf, err = serf.Create(conf)
+	if err != nil {
+		a.Logger.Fatal(err)
+	}
+	a.Cluster.Serf.Join(a.Cluster.Peers, true)
+	ch := make(chan serf.Event, 64)
+	conf.EventCh = ch
+	for {
+		select {
+		case e := <-ch:
+			switch t := e.(type) {
+			case serf.UserEvent:
+				fmt.Printf("%s\n", t.Payload)
+			}
+		}
+	}
+}

cluster/cluster.go

@@ -10,6 +10,8 @@ import (
 	"github.com/go-yaml/yaml"
 
 	"github.com/labstack/armor"
+	"github.com/labstack/armor/admin"
+	"github.com/labstack/armor/cluster"
 	"github.com/labstack/armor/http"
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
@@ -100,7 +102,14 @@ func main() {
 	h.LoadPlugins()
 
 	// Start admin
-	// go api.Start(a)
+	if a.Admin != nil {
+		go admin.Start(a)
+	}
+
+	// Start cluster
+	if a.Cluster != nil {
+		go cluster.Start(a)
+	}
 
 	// Start server - start
 	colorer.Printf(banner, colorer.Red("v"+armor.Version), colorer.Blue(armor.Website))