Move HTTP server code to new server.go file

This separates the main control flow and HTTP-related high-level code.

Furthermore the new main.Server type makes the related methods and
function more like the functions from the standard library with a
NewServer() function and methods with only one word as name.

1 files changed, 3 insertions, 52 deletions

diff --git a/main.go b/main.go
index 34d2425..bc8e75a 100644
--- a/main.go
+++ b/main.go
@@ -1,21 +1,15 @@
 package main
 
 import (
-	"context"
-	"embed"
 	"flag"
 	"fmt"
 	"log"
-	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"xengineering.eu/ceres/controller"
 	"xengineering.eu/ceres/model"
 	"xengineering.eu/ceres/view"
-
-	"github.com/gorilla/mux"
 )
 
 func main() {
@@ -46,9 +40,9 @@ func main() {
 
 	view.Init()
 
-	var srv *http.Server = startServer(config.HttpAddress)
-	go srv.ListenAndServe()
-	defer stopServer(srv)
+	server := NewServer(config.HttpAddress)
+	go server.Start()
+	defer server.Stop()
 
 	listener := make(chan os.Signal)
 	signal.Notify(listener, syscall.SIGTERM)
@@ -56,46 +50,3 @@ func main() {
 	sig := <-listener
 	log.Printf("Cleaning up due to OS signal '%v'\n", sig)
 }
-
-//go:embed view/static/simple.css/simple.css view/static/ceres.js
-var static embed.FS
-
-func startServer(addr string) *http.Server {
-	var r *mux.Router = mux.NewRouter()
-
-	r.PathPrefix("/static/").
-		Handler(http.StripPrefix("/static/", http.FileServer(http.FS(static))))
-
-	r.HandleFunc("/version", view.VersionRead(gitDescribe)).Methods(`GET`)
-
-	r.HandleFunc("/recipes", view.RecipesRead).Methods(`GET`)
-
-	r.HandleFunc("/recipe", controller.RecipeCreate).Methods(`POST`)
-	r.HandleFunc("/recipe/{id:[0-9]+}", view.RecipeRead).Methods(`GET`)
-	r.HandleFunc("/recipe/{id:[0-9]+}", controller.RecipeUpdate).Methods(`POST`)
-	r.HandleFunc("/recipe/{id:[0-9]+}", controller.RecipeDelete).Methods(`DELETE`)
-
-	r.HandleFunc("/favicon.ico", view.FaviconRead).Methods(`GET`)
-
-	r.HandleFunc("/", view.IndexRead).Methods(`GET`)
-
-	muxer := http.NewServeMux()
-	muxer.Handle("/", r)
-
-	var srv http.Server
-	srv.Addr = addr
-	srv.Handler = muxer
-
-	log.Printf("Configured server to listen on http://%s\n", srv.Addr)
-
-	return &srv
-}
-
-func stopServer(srv *http.Server) {
-	var err error = srv.Shutdown(context.Background())
-	if err != nil {
-		log.Printf("Failed to shutdown HTTP server: %v\n", err)
-	} else {
-		log.Println("Stopped HTTP server")
-	}
-}