Add the IP annotation service to main() (#24)

Also clean up a lint error, and simplify Serve() by using errorx.Suppress

Author: pboothe

annotator/annotator.go

@@ -73,6 +73,8 @@ type Network struct {
 	Systems []System `json:",omitempty"`
 }
 
+// FirstASN gives the ASN that should be used by systems that don't want to deal
+// with the complication of MOAS IP addresses.
 func (n *Network) FirstASN() uint32 {
 	if n.Systems == nil || len(n.Systems) == 0 {
 		return 0

ipservice/ipservice_test.go

@@ -64,10 +64,7 @@ func TestServerAndClientE2E(t *testing.T) {
 	wg := sync.WaitGroup{}
 	wg.Add(1)
 	go func() {
-		err := srv.Serve()
-		if err != http.ErrServerClosed {
-			t.Error("Bad error", err, "when we expected", http.ErrServerClosed)
-		}
+		rtx.Must(srv.Serve(), "Could not serve the annotator")
 		wg.Done()
 	}()
 

ipservice/server.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"net/http"
 
+	"github.com/m-lab/go/errorx"
 	"github.com/m-lab/go/rtx"
 	"github.com/m-lab/uuid-annotator/annotator"
 	"github.com/m-lab/uuid-annotator/asnannotator"
@@ -72,7 +73,7 @@ type server struct {
 }
 
 func (s *server) Serve() error {
-	return s.srv.Serve(s.listener)
+	return errorx.Suppress(s.srv.Serve(s.listener), http.ErrServerClosed)
 }
 
 func (s *server) Close() error {

main.go

@@ -18,6 +18,7 @@ import (
 	"github.com/m-lab/uuid-annotator/asnannotator"
 	"github.com/m-lab/uuid-annotator/geoannotator"
 	"github.com/m-lab/uuid-annotator/handler"
+	"github.com/m-lab/uuid-annotator/ipservice"
 	"github.com/m-lab/uuid-annotator/rawfile"
 	"github.com/m-lab/uuid-annotator/siteannotator"
 )
@@ -130,5 +131,22 @@ func main() {
 		wg.Done()
 	}()
 
+	// Set up the local service to serve IP annotations as a local service on a
+	// local unix-domain socket.
+	if *ipservice.SocketFilename != "" {
+		ipsrv, err := ipservice.NewServer(*ipservice.SocketFilename, asn, geo)
+		rtx.Must(err, "Could not start up the local IP annotation service")
+		wg.Add(2)
+		go func() {
+			rtx.Must(ipsrv.Serve(), "Could not serve the local IP annotation service")
+			wg.Done()
+		}()
+		go func() {
+			<-mainCtx.Done()
+			ipsrv.Close()
+			wg.Done()
+		}()
+	}
+
 	wg.Wait()
 }

main_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/m-lab/go/rtx"
 	"github.com/m-lab/tcp-info/eventsocket"
+	"github.com/m-lab/uuid-annotator/ipservice"
 )
 
 func TestMainSmokeTest(t *testing.T) {
@@ -22,6 +23,7 @@ func TestMainSmokeTest(t *testing.T) {
 	// Set up global variables.
 	mainCtx, mainCancel = context.WithCancel(context.Background())
 	*eventsocket.Filename = dir + "/eventsocket.sock"
+	*ipservice.SocketFilename = dir + "/ipannotator.sock"
 	rtx.Must(maxmindurl.Set("file:./testdata/fake.tar.gz"), "Failed to set maxmind url for testing")
 	rtx.Must(routeviewv4.Set("file:./testdata/RouteViewIPv4.tiny.gz"), "Failed to set routeview v4 url for testing")
 	rtx.Must(routeviewv6.Set("file:./testdata/RouteViewIPv6.tiny.gz"), "Failed to set routeview v6 url for testing")