Fix #102

internal/server/control/server.go

@@ -18,10 +18,22 @@ package control
 
 import (
 	"log"
+	"net"
 	"net/http"
+	"sync"
 )
 
 // Run Starts the control server listening in bindAddr
-func Run(bindAddr string) {
-	log.Fatal(http.ListenAndServe(bindAddr, configRouter()))
+func Run(bindAddr string, wg *sync.WaitGroup) {
+
+	listener, err := net.Listen("tcp", bindAddr)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Signal startup
+	log.Printf("ControlServer listening at %s\n", bindAddr)
+	wg.Done()
+
+	log.Fatal(http.Serve(listener, configRouter()))
 }