diff options
| -rw-r--r-- | main.go | 55 | ||||
| -rw-r--r-- | server.go | 64 |
2 files changed, 67 insertions, 52 deletions
@@ -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") - } -} diff --git a/server.go b/server.go new file mode 100644 index 0000000..32d22b1 --- /dev/null +++ b/server.go @@ -0,0 +1,64 @@ +package main + +import ( + "context" + "embed" + "log" + "net/http" + + "xengineering.eu/ceres/controller" + "xengineering.eu/ceres/view" + + "github.com/gorilla/mux" +) + +type Server struct { + backend *http.Server +} + +//go:embed view/static/simple.css/simple.css view/static/ceres.js +var static embed.FS + +func NewServer(addr string) 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 Server{backend: &srv} +} + +func (s Server) Start() { + s.backend.ListenAndServe() +} + +func (s Server) Stop() { + err := s.backend.Shutdown(context.Background()) + if err != nil { + log.Printf("Failed to shutdown HTTP server: %v\n", err) + } else { + log.Println("Stopped HTTP server") + } +} |