From 6a98858dd06cb7afbc1f3cc30fd2f5991cd110fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Thu, 8 Feb 2024 20:09:55 +0100 Subject: [PATCH] Don't use Chi --- go.mod | 1 - go.sum | 2 -- main.go | 36 ++++++++++++++++-------------------- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index d9c8d79..dd3a996 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/TheLovinator1/FeedVault go 1.22.0 require ( - github.com/go-chi/chi/v5 v5.0.11 github.com/stretchr/testify v1.8.4 github.com/tdewolff/minify/v2 v2.20.16 gorm.io/driver/sqlite v1.5.5 diff --git a/go.sum b/go.sum index 228c6cc..2db0ad1 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA= -github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= diff --git a/main.go b/main.go index 8969ca7..4c55daf 100644 --- a/main.go +++ b/main.go @@ -4,8 +4,6 @@ import ( "log" "net/http" - "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" "gorm.io/driver/sqlite" "gorm.io/gorm" ) @@ -34,26 +32,24 @@ func init() { func main() { log.Println("Starting FeedVault...") - // Scrape the bad URLs in the background - // TODO: Run this in a goroutine - - // Create a new router - r := chi.NewRouter() - - // Middleware - r.Use(middleware.RealIP) - r.Use(middleware.Logger) - r.Use(middleware.Recoverer) - r.Use(middleware.Compress(5)) - r.Use(middleware.Heartbeat("/ping")) + // Create a new ServeMux + mux := http.NewServeMux() // Routes - r.Get("/", IndexHandler) - r.Get("/api", ApiHandler) - r.Get("/feeds", FeedsHandler) - r.Post("/add", AddFeedHandler) - r.Post("/upload_opml", UploadOpmlHandler) + mux.HandleFunc("/", IndexHandler) + mux.HandleFunc("/api", ApiHandler) + mux.HandleFunc("/feeds", FeedsHandler) + mux.HandleFunc("/add", AddFeedHandler) + mux.HandleFunc("/upload_opml", UploadOpmlHandler) + + // Create server + server := &http.Server{ + Addr: "127.0.0.1:8000", + Handler: mux, + } log.Println("Listening on http://localhost:8000/ to stop") - http.ListenAndServe("127.0.0.1:8000", r) + if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed { + log.Fatalf("Server error: %v", err) + } }