Moved all config-like things into one placeHEADmaster

1 files changed, 5 insertions, 14 deletions

diff --git a/main.go b/main.go
index 011e8c4..e3cd540 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,6 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"os"
 	"strconv"
 	"time"
 
@@ -118,28 +117,20 @@ func handleHome(pathname string) func(http.ResponseWriter, *http.Request) {
 	}
 }
 
-func handleRequests() {
+func handleRequests(port string) {
 	router := mux.NewRouter()
 	router.HandleFunc("/entries", handleEntryOptions).Methods("OPTIONS")
 	router.HandleFunc("/entries", handleEntryPost).Methods("POST")
 	router.HandleFunc("/entries", handleEntryGet).Methods("GET")
 	router.HandleFunc("/", handleHome("index.html.in")).Methods("GET")
 	router.PathPrefix("/").Handler(http.FileServer(http.FS(content)))
-	log.Fatal(http.ListenAndServe(configure(), router))
-}
-
-func configure() string {
-	at := os.Getenv("STATSAT")
-	if at == "" {
-		log.Println("Defaulting to STATSAT=:8080")
-		at = ":8080"
-	}
-	return at
+	log.Fatal(http.ListenAndServe(port, router))
 }
 
 func main() {
 	log.Println("Starting up")
-	InitEntries()
+	cfg := LoadConfig()
+	InitEntries(cfg.DB)
 	defer CloseEntries()
-	handleRequests()
+	handleRequests(cfg.Port)
 }