Merge branch 'master' of https://git.kemonine.info/PiFrame/piframe-go

CHANGELOG.md

@@ -1,11 +1,9 @@
 # Change Log
 
-## 20200906-2
-
-- Add HDMI on/off command for help with ensuring screen is on OR off at boot since systemd timers won't re-run on boot
-
 ## 20200906-1
 
+- Build bug fixes
+- Add HDMI on/off command for help with ensuring screen is on OR off at boot since systemd timers won't re-run on boot
 - Update tools to watch for config changes and restart if config has changed
 
 ## 20200905-4

cmd/fan/fan.go

@@ -20,7 +20,7 @@ const (
 
 func main() {
 	// Load the config file
-	pfConfig, configFileProvider := config.LoadConfig()
+	pfConfig, configFileProvider := config.LoadConfig(false)
 
 	// Watch for config changes and re-load config if needed
 	configFileProvider.Watch(func(event interface{}, err error) {

cmd/gui/gui.go

@@ -34,7 +34,7 @@ func main() {
 
 	log.Print("Loading config")
 	// Load the config file
-	pfConfig, configFileProvider := config.LoadConfig()
+	pfConfig, configFileProvider := config.LoadConfig(false)
 	log.Printf("%v", pfConfig)
 	pfConfig.Print()
 

cmd/hdmi/hdmi.go

@@ -2,22 +2,22 @@ package main
 
 import (
 	"log"
+	"os/exec"
 	"strconv"
 	"strings"
 	"time"
-	"os/exec"
 
 	"git.kemonine.info/PiFrame/config"
 )
 
 const (
-	CMD_VCGENCMD = "/opt/vc/bin//vcgencmd"
+	CMD_VCGENCMD               = "/opt/vc/bin//vcgencmd"
 	CMD_VCGENCMD_DISPLAY_POWER = "display_power"
 )
 
 func main() {
 	// Load the config file
-	pfConfig, _ := config.LoadConfig()
+	pfConfig, _ := config.LoadConfig(false)
 	pfConfig.Print()
 
 	// Read config values

cmd/inotify/inotify.go

@@ -18,7 +18,7 @@ const (
 
 func main() {
 	// Load the config file
-	pfConfig, configFileProvider := config.LoadConfig()
+	pfConfig, configFileProvider := config.LoadConfig(false)
 
 	// Watch for config changes and re-load config if needed
 	configFileProvider.Watch(func(event interface{}, err error) {

config/config.go

@@ -9,7 +9,7 @@ import (
 	kfile "github.com/knadh/koanf/providers/file"
 )
 
-func LoadConfig() (*koanf.Koanf, *kfile.File) {
+func LoadConfig(errFatalOnMissing bool) (*koanf.Koanf, *kfile.File) {
 	// Main config variable
 	var pfConfig = koanf.New(".")
 
@@ -30,7 +30,11 @@ func LoadConfig() (*koanf.Koanf, *kfile.File) {
 	configFileProvider := kfile.Provider(CONFIG_FILE_PATH)
 	log.Print("========================================")
 	if err := pfConfig.Load(configFileProvider, toml.Parser()); err != nil {
-		log.Fatalf("Error loading config : %s", err)
+		if errFatalOnMissing {
+			log.Fatalf("Error loading config : %s", err)
+		} else {
+			log.Printf("Error loading config : %s", err)
+		}
 	}
 	log.Print("========================================")