Skip to content

Commit e8d9e80

Browse files
committed
return err instead
1 parent 97e9a8a commit e8d9e80

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

internal/config/config.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -616,15 +616,14 @@ func (c *Config) Load() error {
616616
case errors.Is(readInConfigErr, fs.ErrPermission):
617617
fileInfo, err := os.Stat(c.V.ConfigFileUsed())
618618
if err != nil {
619-
log.Fatal("Error getting config file info: ", err)
619+
return fmt.Errorf("getting config file info: %w", err)
620620
}
621621

622622
mode := fmt.Sprintf("%o", fileInfo.Mode().Perm())
623-
es := fmt.Sprintf("Config file permission is %s, it should be %o", mode, os.FileMode(0o644))
624-
log.Fatal(es, "err", readInConfigErr)
623+
return fmt.Errorf("config file permission is %s, it should be %o: %w", mode, os.FileMode(0o644), readInConfigErr)
625624

626625
case isValidYAML(c.V.ConfigFileUsed()) != nil:
627-
log.Fatal(readInConfigErr)
626+
return fmt.Errorf("invalid YAML: %w", readInConfigErr)
628627
}
629628
} else {
630629
level := strings.ToLower(strings.TrimSpace(c.V.GetString("kiosk.config_validation_level")))

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func main() {
9898

9999
configErr := baseConfig.Load()
100100
if configErr != nil {
101-
log.Error("Failed to load config", "err", configErr)
101+
log.Fatal("Failed to load config", "err", configErr)
102102
}
103103

104104
if baseConfig.Kiosk.DemoMode {

0 commit comments

Comments
 (0)