Don't panic! Propagate error

This commit is contained in:
daru
2021-10-17 13:49:56 +02:00
parent 1d7dcbe3ba
commit 290a9af7f1
3 changed files with 14 additions and 10 deletions

View File

@@ -16,6 +16,7 @@ var (
}
)
func Load(configFilePath string) {
Config = loadConfFile(configFilePath)
func Load(configFilePath string) (*Configuration, error) {
Config, err := loadConfFile(configFilePath)
return &Config, err
}

View File

@@ -8,7 +8,7 @@ import (
"github.com/pelletier/go-toml/v2"
)
func loadConfFile(configFilePath string) Configuration {
func loadConfFile(configFilePath string) (Configuration, error) {
bytes, err := ioutil.ReadFile(configFilePath)
if err != nil {
@@ -22,23 +22,23 @@ func loadConfFile(configFilePath string) Configuration {
if err != nil {
color.Errorln(err.Error())
color.Errorln("Configuration file " + configFilePath + " could not be read as TOML file")
panic(err)
return defaultConfig, err
}
color.Infoln("Loaded configuration file " + configFilePath)
return cfg
return cfg, err
}
func createNewConfig(configFilePath string) Configuration {
func createNewConfig(configFilePath string) (Configuration, error) {
confBytes, err := toml.Marshal(defaultConfig)
if err != nil {
color.Errorln(err.Error())
color.Errorln("Default config struct is not TOML conform")
panic(err)
return defaultConfig, err
}
err = os.WriteFile(configFilePath, confBytes, 0644)
if err != nil {
color.Errorln(err.Error())
color.Warnln("Using default config without file")
}
return defaultConfig
return defaultConfig, err
}

View File

@@ -15,9 +15,12 @@ var (
func main() {
flag.Parse()
config.Load(*configFile)
_, err := config.Load(*configFile)
if err != nil {
log.Fatalf("Failed to load configuration: %s\n ", err.Error())
}
err := dns.Run()
err = dns.Run()
if err != nil {
log.Fatalf("Failed to start DNS server: %s\n ", err.Error())
}