refactor: merge http/router and http/server packages

Signed-off-by: Jörg Jooss <[email protected]>

Author: joergjo

booklibrary/cmd/booklibrary-api/main.go

@@ -3,19 +3,19 @@ package main
 import (
 	"context"
 	"flag"
-	"fmt"
 	"net/http"
 	"os"
+	"os/signal"
 	"runtime"
+	"syscall"
 	"time"
 
 	"log/slog"
 
 	"github.com/joergjo/go-samples/booklibrary/internal/config"
-	"github.com/joergjo/go-samples/booklibrary/internal/http/router"
-	"github.com/joergjo/go-samples/booklibrary/internal/http/server"
 	"github.com/joergjo/go-samples/booklibrary/internal/log"
 	"github.com/joergjo/go-samples/booklibrary/internal/mongo"
+	"github.com/joergjo/go-samples/booklibrary/internal/webapi"
 )
 
 var (
@@ -34,12 +34,17 @@ func main() {
 		slog.Warn("debug logging enabled")
 	}
 
+	os.Exit(run(s))
+}
+
+func run(s config.Settings) int {
 	crud, err := newCrudService(s.MongoURI, s.Db, s.Collection)
 	if err != nil {
 		slog.Error("creating book service", log.ErrorKey, err)
-		os.Exit(1)
+		return 1
 	}
 	defer func() {
+		slog.Info("closing database connection")
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
 		if err := crud.Close(ctx); err != nil {
@@ -49,19 +54,41 @@ func main() {
 		}
 	}()
 
-	mux := router.NewMux(crud)
-	srv := server.New(mux, s.Port)
-	done := make(chan struct{})
-	go server.Shutdown(context.Background(), srv, done)
+	srv := webapi.NewServer(crud, s.Port)
+
+	errC := make(chan error, 1)
+	go func() {
+		slog.Info("starting server", log.AddrKey, srv.Addr)
+		if err := srv.ListenAndServe(); err != http.ErrServerClosed {
+			errC <- err
+		}
+	}()
+
+	sigC := make(chan os.Signal, 1)
+	signal.Notify(sigC, syscall.SIGINT, syscall.SIGTERM)
 
-	slog.Info(fmt.Sprintf("server starting, listening on 0.0.0.0:%d", s.Port))
-	if err = srv.ListenAndServe(); err != http.ErrServerClosed {
+	var exit int
+	select {
+	case err := <-errC:
 		slog.Error("server error", log.ErrorKey, err)
-		os.Exit(1)
+		exit = 1
+	case sig := <-sigC:
+		slog.Warn("received signal, shutting down", "signal", sig.String())
+
+		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+
+		slog.Info("waiting for server to shut down")
+		if err := srv.Shutdown(ctx); err != nil {
+			slog.Error("shutting down server", "error", err)
+			if err := srv.Close(); err != nil {
+				slog.Error("forcefully closing server", "error", err)
+			}
+		}
+		slog.Info("server has shut down")
 	}
-	slog.Info("waiting for shut down to complete")
-	<-done
-	slog.Info("server has shut down")
+
+	return exit
 }
 
 func configure() config.Settings {
@@ -72,11 +99,11 @@ func configure() config.Settings {
 	coll := config.GetEnvString("BOOKLIBRARY_COLLECTION", "books")
 	debug := config.GetEnvBool("BOOKLIBRARY_DEBUG", false)
 
-	flag.IntVar(&(s.Port), "port", port, "HTTP port to listen on")
-	flag.StringVar(&(s.MongoURI), "mongoURI", mongoURI, "MongoDB URI to connect to")
-	flag.StringVar(&(s.Db), "db", db, "MongoDB database")
-	flag.StringVar(&(s.Collection), "collection", coll, "MongoDB collection")
-	flag.BoolVar(&(s.Debug), "debug", debug, "Enable debug logging")
+	flag.IntVar(&s.Port, "port", port, "HTTP port to listen on")
+	flag.StringVar(&s.MongoURI, "mongoURI", mongoURI, "MongoDB URI to connect to")
+	flag.StringVar(&s.Db, "db", db, "MongoDB database")
+	flag.StringVar(&s.Collection, "collection", coll, "MongoDB collection")
+	flag.BoolVar(&s.Debug, "debug", debug, "Enable debug logging")
 	flag.Parse()
 	return s
 }

booklibrary/internal/log/keys.go

@@ -4,4 +4,5 @@ const (
 	ErrorKey    = "error"
 	IdKey       = "id"
 	MongoURIKey = "mongoURI"
+	AddrKey     = "addr"
 )

booklibrary/internal/http/router/json.go renamed to booklibrary/internal/webapi/json.go

@@ -1,4 +1,4 @@
-package router
+package webapi
 
 import (
 	"encoding/json"

booklibrary/internal/http/router/metrics.go renamed to booklibrary/internal/webapi/metrics.go

@@ -1,4 +1,4 @@
-package router
+package webapi
 
 import (
 	"net/http"

booklibrary/internal/http/router/mux.go renamed to booklibrary/internal/webapi/mux.go

@@ -1,4 +1,4 @@
-package router
+package webapi
 
 import (
 	"context"

booklibrary/internal/http/router/mux_test.go renamed to booklibrary/internal/webapi/mux_test.go

@@ -1,13 +1,13 @@
-package router_test
+package webapi_test
 
 import (
 	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
-	"github.com/joergjo/go-samples/booklibrary/internal/http/router"
 	"github.com/joergjo/go-samples/booklibrary/internal/model"
+	"github.com/joergjo/go-samples/booklibrary/internal/webapi"
 )
 
 func TestSystemEndpoints(t *testing.T) {
@@ -38,7 +38,7 @@ func TestSystemEndpoints(t *testing.T) {
 			crud.GetFn = func(_ context.Context, id string) (model.Book, error) {
 				return model.Book{}, nil
 			}
-			router := router.NewMux(&crud)
+			router := webapi.NewMux(&crud)
 			ts := httptest.NewServer(router)
 			defer ts.Close()
 

booklibrary/internal/http/router/resource.go renamed to booklibrary/internal/webapi/resource.go

@@ -1,4 +1,4 @@
-package router
+package webapi
 
 import (
 	"errors"

booklibrary/internal/http/router/resource_test.go renamed to booklibrary/internal/webapi/resource_test.go

@@ -1,4 +1,4 @@
-package router_test
+package webapi_test
 
 import (
 	"bytes"
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/joergjo/go-samples/booklibrary/internal/http/router"
 	"github.com/joergjo/go-samples/booklibrary/internal/model"
+	"github.com/joergjo/go-samples/booklibrary/internal/webapi"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
@@ -102,7 +102,7 @@ func TestListBooks(t *testing.T) {
 				}
 				return bb, nil
 			}
-			router := router.NewResource(&crud)
+			router := webapi.NewResource(&crud)
 			path := "/"
 			if tc.limit != -1 {
 				path = fmt.Sprintf("%s?limit=%d", path, tc.limit)
@@ -159,7 +159,7 @@ func TestGetBook(t *testing.T) {
 				return b, nil
 			}
 
-			router := router.NewResource(&crud)
+			router := webapi.NewResource(&crud)
 			r := httptest.NewRequest(http.MethodGet, "/"+tc.in, nil)
 			w := httptest.NewRecorder()
 			router.ServeHTTP(w, r)
@@ -214,7 +214,7 @@ func TestDeleteBook(t *testing.T) {
 				return b, nil
 			}
 
-			router := router.NewResource(&crud)
+			router := webapi.NewResource(&crud)
 			r := httptest.NewRequest(http.MethodDelete, "/"+tc.in, nil)
 			w := httptest.NewRecorder()
 			router.ServeHTTP(w, r)
@@ -233,7 +233,7 @@ func TestAddBook(t *testing.T) {
 		return book, nil
 	}
 
-	router := router.NewResource(&crud)
+	router := webapi.NewResource(&crud)
 	book := model.Book{
 		Author:      "Jörg Jooss",
 		Title:       "Go Testing in Action",
@@ -311,7 +311,7 @@ func TestUpdateBook(t *testing.T) {
 				t.Fatalf("Error marshaling Book: %v.", err)
 			}
 
-			router := router.NewResource(&crud)
+			router := webapi.NewResource(&crud)
 			r := httptest.NewRequest(http.MethodPut, "/"+book.ID, bytes.NewBuffer(body))
 			r.Header.Set("Content-Type", applicationJSON)
 			w := httptest.NewRecorder()

booklibrary/internal/http/server/server.go renamed to booklibrary/internal/webapi/server.go

@@ -1,4 +1,4 @@
-package server
+package webapi
 
 import (
 	"context"
@@ -12,16 +12,18 @@ import (
 	"log/slog"
 
 	"github.com/joergjo/go-samples/booklibrary/internal/log"
+	"github.com/joergjo/go-samples/booklibrary/internal/model"
 )
 
-// New creates a new HTTP server with the given handler and port.
-func New(h http.Handler, port int) *http.Server {
+// NewServer creates a new HTTP server with the given handler and port.
+func NewServer(crud model.CrudService, port int) *http.Server {
+	mux := NewMux(crud)
 	s := http.Server{
 		Addr:         fmt.Sprintf(":%d", port),
 		ReadTimeout:  5 * time.Second,
 		WriteTimeout: 10 * time.Second,
 		IdleTimeout:  120 * time.Second,
-		Handler:      h,
+		Handler:      mux,
 	}
 	return &s
 }