Consolidate mux initialization (efixler#38)

Author: efixler

cmd/scrape-server/main.go

@@ -78,14 +78,16 @@ func main() {
 		slog.Info("scrape-server authorization is disabled, running in open access mode")
 	}
 
-	mux, err := server.InitMux(ss, dbh, publicHome.Get())
+	mux, err := server.InitMux(
+		ss,
+		dbh,
+		publicHome.Get(),
+		profile.Get(),
+	)
 	if err != nil {
 		slog.Error("scrape-server error initializing the server's mux", "error", err)
 		os.Exit(1)
 	}
-	if profile.Get() {
-		server.EnableProfiling(mux)
-	}
 	s := &http.Server{
 		Addr:           fmt.Sprintf(":%d", port.Get()),
 		Handler:        mux,

internal/server/routes.go

@@ -8,7 +8,18 @@ import (
 	"github.com/efixler/scrape/internal/server/healthchecks"
 )
 
-func InitMux(ss *scrapeServer, db *database.DBHandle, openHome bool) (*http.ServeMux, error) {
+// Mux Initialization Arguments:
+//   - ss: scrapeServer: used for setting up API routes
+//   - db: database.DBHandle: used for healthchecks
+//   - openHome: bool: if true, the the page will always be open, even
+//     if auth is enabled
+//   - enableProfiling: bool: if true, pprof routes will be added to the mux
+func InitMux(
+	ss *scrapeServer,
+	db *database.DBHandle,
+	openHome bool,
+	enableProfiling bool,
+) (*http.ServeMux, error) {
 	mux := http.NewServeMux()
 	mux.HandleFunc("GET /{$}", homeHandler(ss, openHome))
 	mux.Handle("/assets/", assetsHandler())
@@ -24,13 +35,12 @@ func InitMux(ss *scrapeServer, db *database.DBHandle, openHome bool) (*http.Serv
 	mux.HandleFunc("GET /feed", h)
 	mux.HandleFunc("POST /feed", h)
 	mux.Handle("GET /.well-known/", healthchecks.Handler("/.well-known", db))
+	if enableProfiling {
+		initPProf(mux)
+	}
 	return mux, nil
 }
 
-func EnableProfiling(mux *http.ServeMux) {
-	initPProf(mux)
-}
-
 func initPProf(mux *http.ServeMux) {
 	// pprof
 	mux.HandleFunc("GET /debug/pprof/", http.HandlerFunc(pprof.Index))

internal/server/routes_test.go

@@ -15,7 +15,7 @@ func TestWellknown(t *testing.T) {
 	//ctx, cancel := context.WithCancel(context.Background())
 	//defer cancel()
 
-	mux, err := InitMux(&scrapeServer{}, nil, false)
+	mux, err := InitMux(&scrapeServer{}, nil, false, false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -61,7 +61,7 @@ func TestExtractErrors(t *testing.T) {
 		WithURLFetcher(trafilatura.MustNew(nil)),
 	)
 
-	mux, err := InitMux(ss, nil, false)
+	mux, err := InitMux(ss, nil, false, false)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/server/server_test.go

@@ -106,7 +106,7 @@ func TestBatchReponseIsValid(t *testing.T) {
 		WithURLFetcher(fetcher),
 	)
 
-	mux, err := InitMux(ss, nil, false)
+	mux, err := InitMux(ss, nil, false, false)
 	if err != nil {
 		t.Fatal(err)
 	}