Prepare 1.5.0

Author: kilgaloon

api/server.go

@@ -5,8 +5,6 @@ import (
 	"net/http"
 )
 
-var mux = http.NewServeMux()
-
 // API defines socket on which we listen for commands
 type API struct {
 	HTTP *http.Server
@@ -38,14 +36,18 @@ func (a *API) RegisterHandle(e string, h func(w http.ResponseWriter, r *http.Req
 	pattern := "/" + e;
 
 	if _, exist := a.registeredHandles[pattern]; !exist {
-		mux.HandleFunc(pattern, h)
 		a.registeredHandles[pattern] = h
 	}
 }
 
 // Start api server
 func (a *API) Start() {
 	if !IsAPIRunning() {
+		mux := http.NewServeMux()
+		for pattern, handler := range a.registeredHandles {
+			mux.HandleFunc(pattern, handler)
+		}
+
 		a.HTTP.Handler = mux
 		if err := a.HTTP.ListenAndServe(); err == http.ErrServerClosed {
 			a.HTTP = &http.Server{

daemon/main.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/getsentry/raven-go"
 	"github.com/kilgaloon/leprechaun/api"
@@ -28,6 +29,7 @@ type Daemon struct {
 	Debug        bool
 	API          *api.API
 	shutdownChan chan bool
+	*sync.RWMutex
 }
 
 // GetPID gets current PID of client
@@ -57,6 +59,9 @@ func (d *Daemon) GetPidPath() string {
 
 // AddService push agent as a service to list of services
 func (d *Daemon) AddService(s Service) {
+	d.Lock()
+	defer d.Unlock()
+	
 	name := s.GetName()
 	cfg := d.Configs.New(name, d.GetConfigPath())
 	a := s.New(name, cfg, d.Debug)
@@ -66,8 +71,18 @@ func (d *Daemon) AddService(s Service) {
 	d.services[name] = a
 }
 
+// SetCommand sets command for daemon to be executed
+func (d *Daemon) SetCommand(cmd api.Cmd) {
+	d.Lock()
+	d.Cmd = cmd
+	d.Unlock()
+}
+
 // Run starts daemon and long living process
 func (d *Daemon) Run(cb func()) {
+	d.Lock()
+	defer d.Unlock()
+
 	if api.IsAPIRunning() {
 		// more commands can/will be used here
 		if d.Cmd.Agent() == "daemon" {
@@ -205,6 +220,7 @@ func Init() *Daemon {
 	d.Cmd = api.Cmd(*cmd)
 	d.API = api.New()
 	d.shutdownChan = make(chan bool, 1)
+	d.RWMutex = new(sync.RWMutex)
 
 	cfg := d.Configs.New("daemon", d.ConfigPath)
 	if cfg.GetErrorReporting() && os.Getenv("RUN_MODE") != "test" {

daemon/main_test.go

@@ -67,17 +67,16 @@ func TestMain(t *testing.T) {
 
 func TestAddService(t *testing.T) {
 	d := Init()
-
 	d.Cmd = "run fake_service"
 	d.AddService(&fakeService{})
 
 	go d.Run(nil)
 }
 
 func TestRun(t *testing.T) {
-	p := Init()
-	go p.Run(func() {
-		if p.GetPID() != os.Getpid() {
+	d := Init()
+	go d.Run(func() {
+		if d.GetPID() != os.Getpid() {
 			t.Fatal("PID NOT MATCHED")
 		}
 
@@ -88,7 +87,7 @@ func TestRun(t *testing.T) {
 
 		rr := httptest.NewRecorder()
 
-		p.daemonInfo(rr, req)
+		d.daemonInfo(rr, req)
 
 		for i := 0; i < 5; i++ {
 			_, err := http.Get("http://localhost:11401")
@@ -98,15 +97,14 @@ func TestRun(t *testing.T) {
 				continue
 			}
 
-			p.GetInfo()
-			p.renderInfo()
+			d.GetInfo()
+			d.renderInfo()
 		}
 	})
 }
 
 func TestRunningDaemonInfo(t *testing.T) {
 	d := Init()
-
 	d.Cmd = "daemon info"
 	d.Run(func() {
 		for i := 0; i < 5; i++ {
@@ -125,7 +123,6 @@ func TestRunningDaemonInfo(t *testing.T) {
 
 func TestRunningDaemonServices(t *testing.T) {
 	d := Init()
-
 	d.Cmd = "daemon services"
 	d.Run(func() {
 		for i := 0; i < 5; i++ {
@@ -145,7 +142,6 @@ func TestRunningDaemonServices(t *testing.T) {
 
 func TestRunningDaemonKill(t *testing.T) {
 	d := Init()
-
 	d.Cmd = "daemon kill"
 	d.Run(func() {
 		for i := 0; i < 5; i++ {
@@ -169,7 +165,7 @@ func TestAPIRunning(t *testing.T) {
 	d := Init()
 
 	d.Cmd = ""
-	d.Run(nil)
+	go d.Run(nil)
 
 	d = Init()