From 9f1fc3ca35845a0fe5501f8a56646d6568e89e48 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Mon, 25 Mar 2024 20:26:30 +0100
Subject: Make the parsed configuration a global variable

This removes the need to pass the configuration struct to every
function.
---
 config.go | 7 +++----
 main.go   | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config.go b/config.go
index 3bb153b..f63d284 100644
--- a/config.go
+++ b/config.go
@@ -7,6 +7,8 @@ import (
 	"log"
 )
 
+var config RuntimeConfig
+
 type RuntimeConfig struct {
 	Devices DevicesConfig
 	Web     WebConfig
@@ -22,7 +24,7 @@ type WebConfig struct {
 
 // parseConfig() parses and validates the runtime configuration file and
 // returns it as Go datastructure.
-func parseConfig(path string) RuntimeConfig {
+func parseConfig(path string) {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		log.Fatalf("Could not read '%s'!", path)
@@ -32,11 +34,8 @@ func parseConfig(path string) RuntimeConfig {
 		log.Fatalf("%s contains invalid JSON!", path)
 	}
 
-	config := RuntimeConfig{}
 	err = json.Unmarshal(data, &config)
 	if err != nil {
 		log.Fatalf("Could not parse configuration file:\n%s\n", err)
 	}
-
-	return config
 }
diff --git a/main.go b/main.go
index 6d930b4..15fcc7a 100644
--- a/main.go
+++ b/main.go
@@ -15,7 +15,7 @@ var templates *template.Template
 
 func main() {
 	configPath := parseFlags()
-	c := parseConfig(configPath)
+	parseConfig(configPath)
 
 	var err error
 	templates, err = template.ParseFS(static, "templates/index.html")
@@ -23,14 +23,14 @@ func main() {
 		log.Fatal(err)
 	}
 
-	http.HandleFunc("/", index(c.Devices))
+	http.HandleFunc("/", index(config.Devices))
 	http.HandleFunc("/api", api)
 	http.Handle("/static/", http.StripPrefix("/static/",
 		http.FileServer(http.FS(static))))
 
-	fmt.Printf("Serving at http://%s\n", c.Web.Listen)
+	fmt.Printf("Serving at http://%s\n", config.Web.Listen)
 
-	log.Fatal(http.ListenAndServe(c.Web.Listen.String(), nil))
+	log.Fatal(http.ListenAndServe(config.Web.Listen.String(), nil))
 }
 
 // parseFlags() handles command line interface (CLI) flags.
-- 
cgit v1.2.3-70-g09d2