Remove monitor server and instead use callback

monitor/monitor.go

@@ -1,13 +1,8 @@
 package monitor
 
 import (
-	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
-	"local1/logger"
-	"net/http"
 	"time"
 
 	"github.com/golang-collections/go-datastructures/queue"
@@ -17,7 +12,6 @@ type Monitor struct {
 	newItems chan Item
 	trigger  func(string)
 	port     string
-	server   *http.Server
 }
 
 func New(port string, trigger func(string)) (*Monitor, error) {
@@ -29,58 +23,8 @@ func New(port string, trigger func(string)) (*Monitor, error) {
 	}, nil
 }
 
-func (monitor *Monitor) listen() error {
-	monitor.server = &http.Server{
-		Addr: monitor.port,
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.URL.Path != "/newfeed" {
-				http.NotFound(w, r)
-				logger.Logf("bad path: %q", r.URL.Path)
-				return
-			}
-			if r.Method != "PUT" && r.Method != "POST" {
-				http.NotFound(w, r)
-				logger.Logf("bad method: %q", r.Method)
-				return
-			}
-			b, err := ioutil.ReadAll(r.Body)
-			defer r.Body.Close()
-			if err != nil || len(b) == 0 {
-				logger.Log(len(b), err)
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-			var item Item
-			if err := json.Unmarshal(b, &item); err != nil {
-				logger.Log(err)
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-			select {
-			case monitor.newItems <- item:
-				w.WriteHeader(http.StatusOK)
-			case <-time.After(time.Second * 10):
-				w.WriteHeader(http.StatusInternalServerError)
-			}
-		}),
-	}
-	if err := monitor.server.ListenAndServe(); err != http.ErrServerClosed && err != nil {
-		return err
-	}
-	return nil
-}
-
 func (monitor *Monitor) Start() error {
 	errs := make(chan error)
-	go func() {
-		if err := monitor.listen(); err != nil {
-			select {
-			case errs <- err:
-			case <-time.After(time.Second * 5):
-				panic(err)
-			}
-		}
-	}()
 	go func() {
 		if err := monitor.loop(); err != nil {
 			select {
@@ -92,7 +36,7 @@ func (monitor *Monitor) Start() error {
 	}()
 	select {
 	case err := <-errs:
-		return fmt.Errorf("%s: %v", "monitor server quit early", err)
+		return fmt.Errorf("%s: %v", "monitor loop quit early", err)
 	case <-time.After(time.Second * 2):
 	}
 	return nil
@@ -159,7 +103,5 @@ func (monitor *Monitor) Stop() error {
 	case <-time.After(time.Second * 10):
 		return errors.New("could not stop monitor")
 	}
-	ctx, can := context.WithTimeout(context.Background(), time.Second*10)
-	defer can()
-	return monitor.server.Shutdown(ctx)
+	return nil
 }