make port configurable. Move server init to initalise func

Author: jtl5770

config.yml.orig

@@ -21,6 +21,8 @@ Hardware:
   LEDType: "ws2801"
   # SPI bus frequency in Hz. 2097152 is a common, stable value for Raspberry Pi.
   SPIFrequency: 2097152
+  # Port of the internal web server used for runtime configuration
+  WebserverPort: 8080
 
   # Configuration for the LED display output.
   Display:

config/config.go

@@ -92,6 +92,7 @@ type BlobCfg struct {
 
 // HardwareConfig defines the hardware configuration.
 type HardwareConfig struct {
+	WebserverPort    uint16        `yaml:"WebserverPort"`
 	LEDType          string        `yaml:"LEDType"`
 	SPIFrequency     int           `yaml:"SPIFrequency"`
 	Display          DisplayConfig `yaml:"Display"`
@@ -261,4 +262,4 @@ func ReadConfig(cfile string) (*Config, error) {
 
 	slog.Debug("Read config", "config", conf)
 	return &conf, nil
-}
+}

goleds.go

@@ -108,16 +108,6 @@ func main() {
 	reloadEvent := u.NewAtomicEvent[bool]()
 	go watchConfigFile(*cfile, reloadEvent)
 
-	// Start the web server in a separate goroutine.
-	http.Handle("/", http.FileServer(http.Dir("./web")))
-	http.HandleFunc("/api/config", c.ConfigHandler(*cfile))
-	go func() {
-		slog.Info("Starting web server", "address", "http://localhost:8080")
-		if err := http.ListenAndServe(":8080", nil); err != nil {
-			slog.Error("Web server failed", "error", err)
-		}
-	}()
-
 	signal.Notify(ossignal, os.Interrupt)
 
 	for {
@@ -326,6 +316,17 @@ func (a *App) initialise(cfile string, realp bool, sensp bool) error {
 
 	go a.combineAndUpdateDisplay(ledReader, ledBufferPool)
 	go a.stateManager()
+
+	// Start the web server in a separate goroutine.
+	http.Handle("/", http.FileServer(http.Dir("./web")))
+	http.HandleFunc("/api/config", c.ConfigHandler(cfile))
+	go func() {
+		slog.Info("Starting web server", "address", "http://localhost:8080")
+		if err := http.ListenAndServe(fmt.Sprintf(":%d", conf.Hardware.WebserverPort), nil); err != nil {
+			slog.Error("Web server failed", "error", err)
+		}
+	}()
+
 	return nil
 }