logging and middleware chaining

cmd/main.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"log"
 	"net/http"
+	"os"
 
 	"gitea.michaelthomson.dev/mthomson/habits/internal/logging"
 	"gitea.michaelthomson.dev/mthomson/habits/internal/middleware"
@@ -22,16 +23,22 @@ func main() {
 	contextMiddleware := middleware.ContextMiddleware(logger)
 	loggingMiddleware := middleware.LoggingMiddleware(logger)
 
+	stack := []middleware.Middleware{
+		contextMiddleware,
+		loggingMiddleware,
+	}
+
 	// create db pool
 	postgresUrl := "postgres://todo:password@localhost:5432/todo"
 	db, err := sql.Open("pgx", postgresUrl)
 	if err != nil {
-		log.Fatalf("Failed to open db pool: %v", err)
+		logger.Error(err.Error())
+		os.Exit(1);
 	}
 	defer db.Close()
 
 	// run migrations
-	migrate.Migrate(db)
+	migrate.Migrate(logger, db)
 
 	// create repos
 	todoRepository := todorepository.NewPostgresTodoRepository(logger, db)
@@ -43,10 +50,10 @@ func main() {
 	mux := http.NewServeMux()
 
 	// register handlers
-	mux.Handle("GET /todo/{id}", contextMiddleware(loggingMiddleware(todohandler.HandleTodoGet(logger, todoService))))
-	mux.Handle("POST /todo", contextMiddleware(loggingMiddleware(todohandler.HandleTodoCreate(logger, todoService))))
-	mux.Handle("DELETE /todo/{id}", contextMiddleware(loggingMiddleware(todohandler.HandleTodoDelete(logger, todoService))))
-	mux.Handle("PUT /todo/{id}", contextMiddleware(loggingMiddleware(todohandler.HandleTodoUpdate(logger, todoService))))
+	mux.Handle("GET /todo/{id}", middleware.CompileMiddleware(todohandler.HandleTodoGet(logger, todoService), stack))
+	mux.Handle("POST /todo", middleware.CompileMiddleware(todohandler.HandleTodoCreate(logger, todoService), stack))
+	mux.Handle("DELETE /todo/{id}", middleware.CompileMiddleware(todohandler.HandleTodoDelete(logger, todoService), stack))
+	mux.Handle("PUT /todo/{id}", middleware.CompileMiddleware(todohandler.HandleTodoUpdate(logger, todoService), stack))
 
 	// create server
 	server := &http.Server{