Rearranged code

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

Author: vishr

Diff for: admin/api/plugin.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/labstack/armor"
-	"github.com/labstack/armor/cluster"
 	"github.com/labstack/armor/plugin"
 	"github.com/labstack/armor/store"
 	"github.com/labstack/armor/util"
@@ -53,7 +52,7 @@ func (h *handler) addPlugin(c echo.Context) (err error) {
 	if err = h.store.AddPlugin(p); err != nil {
 		return err
 	}
-	h.cluster.UserEvent(cluster.EventPluginLoad, []byte(p.ID), true)
+	h.cluster.UserEvent(armor.EventPluginLoad, []byte(p.ID), true)
 	return c.JSON(http.StatusCreated, p)
 
 	// hostName := c.Param("host")
@@ -128,7 +127,7 @@ func (h *handler) savePlugin(c echo.Context) (err error) {
 	if err != nil {
 		return
 	}
-	h.cluster.UserEvent(cluster.EventPluginUpdate, []byte(p.ID), true)
+	h.cluster.UserEvent(armor.EventPluginUpdate, []byte(p.ID), true)
 	return c.NoContent(http.StatusNoContent)
 }
 

Diff for: cluster/cluster.go renamed to cluster.go

@@ -1,4 +1,4 @@
-package cluster
+package armor
 
 import (
 	"log"
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hashicorp/logutils"
 	"github.com/hashicorp/serf/serf"
-	"github.com/labstack/armor"
 )
 
 // Events
@@ -16,7 +15,7 @@ const (
 	EventPluginUpdate = "2"
 )
 
-func Start(a *armor.Armor) {
+func (a *Armor) StartCluster() {
 	conf := serf.DefaultConfig()
 	filter := &logutils.LevelFilter{
 		Levels:   []logutils.LogLevel{"DEBUG", "INFO", "WARN", "ERROR"},

Diff for: cmd/root.go

@@ -11,8 +11,6 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/labstack/armor"
 	"github.com/labstack/armor/admin"
-	"github.com/labstack/armor/cluster"
-	"github.com/labstack/armor/http"
 	"github.com/labstack/armor/store"
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
@@ -133,8 +131,8 @@ func initConfig() {
 		a.Hosts = make(armor.Hosts)
 	}
 
-	// Init http
-	h := http.Init(a)
+	// HTTP
+	h := a.NewHTTP()
 
 	// Store
 	if a.Postgres != nil {
@@ -148,7 +146,7 @@ func initConfig() {
 	a.SavePlugins()
 
 	// Start cluster
-	go cluster.Start(a)
+	go a.StartCluster()
 
 	// Start admin
 	go admin.Start(a)

Diff for: http/http.go renamed to http.go

@@ -1,12 +1,11 @@
-package http
+package armor
 
 import (
 	"crypto/tls"
 	"net/http"
 	"path/filepath"
 	"time"
 
-	"github.com/labstack/armor"
 	"github.com/labstack/armor/util"
 	"github.com/labstack/echo"
 	"github.com/labstack/gommon/log"
@@ -19,13 +18,13 @@ import (
 
 type (
 	HTTP struct {
-		armor  *armor.Armor
+		armor  *Armor
 		echo   *echo.Echo
 		logger *log.Logger
 	}
 )
 
-func Init(a *armor.Armor) (h *HTTP) {
+func (a *Armor) NewHTTP() (h *HTTP) {
 	e := echo.New()
 
 	a.Echo = e
@@ -60,7 +59,7 @@ func Init(a *armor.Armor) (h *HTTP) {
 	e.Pre(func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			c.Response().Before(func() {
-				c.Response().Header().Set(echo.HeaderServer, "armor/"+armor.Version)
+				c.Response().Header().Set(echo.HeaderServer, "armor/"+Version)
 			})
 			return next(c)
 		}

Diff for: website/layouts/partials/head.html

@@ -10,14 +10,14 @@
   <meta name="twitter:creator" content="@labstack">
   <meta name="twitter:title" content="{{ if ne .URL "/" }}{{ .Title }} | {{ end }}{{ .Site.Title }}">
   <meta name="twitter:description" content="{{ if ne .URL "/" }}{{ .Description }} | {{ end }}{{ .Site.Params.description }}">
-  <meta name="twitter:image" content="{{ .Site.BaseURL }}/images/share.png">
+  <meta name="twitter:image" content="{{ .Site.BaseURL }}images/share.png">
   <meta property="og:type" content="website">
   <meta property="og:site_name" content="{{ .Title }}">
   <meta property="og:title" content="{{ if ne .URL "/" }}{{ .Title }} | {{ end }}{{ .Site.Title }}">
   <meta property="og:site_name" content="armor">
   <meta property="og:description" content="{{ if ne .URL "/" }}{{ .Description }} | {{ end }}{{ .Site.Params.description }}">
   <meta property="og:url" content="{{ .Site.BaseURL }}">
-  <meta property="og:image" content="{{ .Site.BaseURL }}/images/share.png">
+  <meta property="og:image" content="{{ .Site.BaseURL }}images/share.png">
   <title>
     {{ if ne .URL "/" }}{{ .Title }} | {{ end }}{{ .Site.Title }}
   </title>