Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardize error messages by removing config prefix

Browse source
This commit is contained in:
andig 2020-07-29 14:10:49 +02:00
parent 3de1f3d072
commit 1e03a51eae
15 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/config.go
View file

@ -55,7 +55,7 @@ func (cp *ConfigProvider) Meter(name string) api.Meter {
if meter, ok := cp.meters[name]; ok {
return meter
}
log.FATAL.Fatalf("config: invalid meter %s", name)
log.FATAL.Fatalf("invalid meter: %s", name)
return nil
}
@ -64,7 +64,7 @@ func (cp *ConfigProvider) Charger(name string) api.Charger {
if charger, ok := cp.chargers[name]; ok {
return charger
}
log.FATAL.Fatalf("config: invalid charger %s", name)
log.FATAL.Fatalf("invalid charger: %s", name)
return nil
}
@ -73,7 +73,7 @@ func (cp *ConfigProvider) Vehicle(name string) api.Vehicle {
if vehicle, ok := cp.vehicles[name]; ok {
return vehicle
}
log.FATAL.Fatalf("config: invalid vehicle %s", name)
log.FATAL.Fatalf("invalid vehicle: %s", name)
return nil
}

2
cmd/config_test.go
View file

@ -32,7 +32,7 @@ func TestDistConfig(t *testing.T) {
// check config does not contain surplus keys
var conf config
if err := viper.UnmarshalExact(&conf); err != nil {
log.FATAL.Fatalf("config: failed parsing config file %s: %v", cfgFile, err)
log.FATAL.Fatalf("failed parsing config file %s: %v", cfgFile, err)
}
// setup mqtt

4
cmd/setup.go
View file

@ -85,7 +85,7 @@ func configureLoadPoints(conf config, cp *ConfigProvider) (loadPoints []*core.Lo
// slice of loadpoints
lps, ok := viper.AllSettings()["loadpoints"]
if !ok {
log.FATAL.Fatal("config: missing loadpoints")
log.FATAL.Fatal("missing loadpoints")
}
// decode slice into slice of maps
@ -107,7 +107,7 @@ func loadConfigFile(cfgFile string) (conf config) {
if cfgFile != "" {
log.INFO.Println("using config file", cfgFile)
if err := viper.UnmarshalExact(&conf); err != nil {
log.FATAL.Fatalf("config: failed parsing config file %s: %v", cfgFile, err)
log.FATAL.Fatalf("failed parsing config file %s: %v", cfgFile, err)
}
} else {
log.FATAL.Fatal("missing evcc config")