PiFrame/piframe-go
PiFrame/piframe-go
1
0
Fork 0
Code Issues Pull requests Releases 15 Activity

Update to make non existing config a soft error

Browse source
This commit is contained in:
KemoNine 2020-09-20 18:10:14 -04:00
parent d5a06b79db
commit df886ff66d
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/fan/fan.go
View file

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

2
cmd/gui/gui.go
View file

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

6
cmd/hdmi/hdmi.go
View file

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

2
cmd/inotify/inotify.go
View file

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

8
config/config.go
View file

@ -9,7 +9,7 @@ import (
kfile "github.com/knadh/koanf/providers/file" kfile "github.com/knadh/koanf/providers/file"
) )
func LoadConfig() (*koanf.Koanf, *kfile.File) { func LoadConfig(errFatalOnMissing bool) (*koanf.Koanf, *kfile.File) {
// Main config variable // Main config variable
var pfConfig = koanf.New(".") var pfConfig = koanf.New(".")
@ -30,7 +30,11 @@ func LoadConfig() (*koanf.Koanf, *kfile.File) {
configFileProvider := kfile.Provider(CONFIG_FILE_PATH) configFileProvider := kfile.Provider(CONFIG_FILE_PATH)
log.Print("========================================") log.Print("========================================")
if err := pfConfig.Load(configFileProvider, toml.Parser()); err != nil { 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("========================================") log.Print("========================================")