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

3
charger/nrgble_linux.go
View file

@ -2,7 +2,6 @@ package charger
import (
"bytes"
"errors"
"fmt"
"os"
"strconv"
@ -47,7 +46,7 @@ func NewNRGKickBLEFromConfig(other map[string]interface{}) (api.Charger, error)
// decode PIN with leading zero
pin, err := strconv.Atoi(cc.PIN)
if err != nil {
return nil, errors.New("config: invalid pin '%s'", cc.PIN)
return nil, fmt.Errorf("invalid pin: %s", cc.PIN)
}
return NewNRGKickBLE(cc.Device, cc.MacAddress, pin)

2
charger/phoenix-emcp.go
View file

@ -39,7 +39,7 @@ func NewPhoenixEMCPFromConfig(other map[string]interface{}) (api.Charger, error)
}
if _, _, err := net.SplitHostPort(cc.URI); err != nil {
return nil, fmt.Errorf("config: missing or invalid phoenix EM-CP uri: %s", cc.URI)
return nil, fmt.Errorf("missing or invalid phoenix uri: %s", cc.URI)
}
return NewPhoenixEMCP(cc.URI, cc.ID)

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")

2
core/loadpoint.go
View file

@ -111,7 +111,7 @@ func NewLoadPointFromConfig(log *util.Logger, cp configProvider, other map[strin
}
if lp.ChargerRef == "" {
lp.log.FATAL.Fatal("config: missing charger")
lp.log.FATAL.Fatal("missing charger")
}
charger := cp.Charger(lp.ChargerRef)
lp.configureChargerType(charger)

4
core/site.go
View file

@ -68,10 +68,10 @@ func NewSiteFromConfig(
// configure meter from references
// if site.Meters.PVMeterRef == "" && site.Meters.GridMeterRef == "" {
// site.log.FATAL.Fatal("config: missing either pv or grid meter")
// site.log.FATAL.Fatal("missing either pv or grid meter")
// }
if site.Meters.GridMeterRef == "" {
site.log.FATAL.Fatal("config: missing grid meter")
site.log.FATAL.Fatal("missing grid meter")
}
if site.Meters.GridMeterRef != "" {
site.gridMeter = cp.Meter(site.Meters.GridMeterRef)

1
errors.yaml
View file

@ -6,6 +6,7 @@ charger:
- "invalid plugin type: ..."
- mqtt not configured
- NRGKick bluetooth is only supported on linux
- invalid pin
vehicle:
- "invalid plugin type: ..."
- received status code 404

8
go.sum
View file

@ -20,14 +20,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alvaroloes/enumer v1.1.2 h1:5khqHB33TZy1GWCO/lZwcroBFh7u+0j40T83VUbfAMY=
github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=
github.com/andig/evcc v0.0.0-20200727161511-d58eb15f2dc9/go.mod h1:8HONEC6cC2s4k0u3QL7GIjrYOZYTOKiiXybw0FIJL0A=
github.com/andig/evcc-config v0.0.0-20200728142959-b798a8b6b384 h1:ol6wEK2NJCIKjyVk3cyQsVKsi1QaVm77XlMNKTLidQA=
github.com/andig/evcc-config v0.0.0-20200728142959-b798a8b6b384/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk=
github.com/andig/evcc-config v0.0.0-20200729061908-dff8e0408168 h1:8UjWHD6HTTcTpWDD0pYlCUXaOUUe5R582EtqLy3fPig=
github.com/andig/evcc-config v0.0.0-20200729061908-dff8e0408168/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk=
github.com/andig/evcc-config v0.0.0-20200729092413-106691a8c13d h1:0bcJtdJmdhUfuOkEIsa7bP+eFVXXAN6W0C/AyKZhIAI=
github.com/andig/evcc-config v0.0.0-20200729092413-106691a8c13d/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk=
github.com/andig/evcc-config v0.0.0-20200729093325-899f5b7c2247 h1:Xv3LS07jQriFZTSZnqkvVj5QS82oy8Io1+cGF49DNl4=
github.com/andig/evcc-config v0.0.0-20200729093325-899f5b7c2247/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk=
github.com/andig/evcc-config v0.0.0-20200729105416-7fbb6e0605cc h1:G+Zpx2yBwqGVZPrUMm8CXpb9sOavQlH9d1CS++cV4SY=
github.com/andig/evcc-config v0.0.0-20200729105416-7fbb6e0605cc/go.mod h1:N0hIjIy+5E2AR1fF7Tg2IzBlblBrnFvCCaDGAaHzbWk=
github.com/andig/gosunspec v0.0.0-20200429133549-3cf6a82fed9c h1:AMtX56iHlNYVxMID7fe9efuVtaxgtdjyMeolg7q87IE=

2
meter/sma.go
View file

@ -70,7 +70,7 @@ func NewSMA(uri, serial, power, energy string) (api.Meter, error) {
} else if serial != "" {
sma.Instance.Subscribe(serial, sm.recv)
} else {
return nil, errors.New("config: missing uri or serial")
return nil, errors.New("missing uri or serial")
}
go sm.receive()

4
meter/tesla.go
View file

@ -46,12 +46,12 @@ func NewTeslaFromConfig(other map[string]interface{}) (api.Meter, error) {
}
if cc.Usage == "" {
return nil, errors.New("config: missing usage")
return nil, errors.New("missing usage setting")
}
url, err := url.ParseRequestURI(cc.URI)
if err != nil {
return nil, fmt.Errorf("config: invalid uri %s", cc.URI)
return nil, fmt.Errorf("invalid uri %s", cc.URI)
}
if url.Path == "" {

4
provider/http.go
View file

@ -33,7 +33,7 @@ type Auth struct {
// NewAuth creates authorization headers from config
func NewAuth(log *util.Logger, auth Auth, headers map[string]string) {
if strings.ToLower(auth.Type) != "basic" {
log.FATAL.Fatalf("config: unsupported auth type: %s", auth.Type)
log.FATAL.Fatalf("unsupported auth type: %s", auth.Type)
}
basicAuth := auth.User + ":" + auth.Password
@ -85,7 +85,7 @@ func NewHTTPProviderFromConfig(other map[string]interface{}) (*HTTP, error) {
if cc.Jq != "" {
op, err := gojq.Parse(cc.Jq)
if err != nil {
return nil, fmt.Errorf("config: invalid jq query: %s", p.jq)
return nil, fmt.Errorf("invalid jq query: %s", p.jq)
}
p.jq = op

6
provider/modbus.go
View file

@ -55,18 +55,18 @@ func NewModbusFromConfig(other map[string]interface{}) (*Modbus, error) {
var op modbus.Operation
if cc.Value != "" && cc.Register.Decode != "" {
return nil, errors.New("config: modbus cannot have value and register both")
return nil, errors.New("modbus cannot have value and register both")
}
if cc.Value == "" && cc.Register.Decode == "" {
log.WARN.Println("config: missing modbus value or register - assuming Power")
log.WARN.Println("missing modbus value or register - assuming Power")
cc.Value = "Power"
}
// model + value configured
if cc.Value != "" {
if err := modbus.ParseOperation(device, cc.Value, &op); err != nil {
return nil, fmt.Errorf("config: invalid value %s", cc.Value)
return nil, fmt.Errorf("invalid value %s", cc.Value)
}
// if sunspec reading configured make sure model is defined or device won't be initalized

2
provider/socket.go
View file

@ -70,7 +70,7 @@ func NewSocketProviderFromConfig(other map[string]interface{}) (*Socket, error)
if cc.Jq != "" {
op, err := gojq.Parse(cc.Jq)
if err != nil {
return nil, fmt.Errorf("config: invalid jq query: %s", p.jq)
return nil, fmt.Errorf("invalid jq query: %s", p.jq)
}
p.jq = op

4
util/modbus/modbus.go
View file

@ -55,7 +55,7 @@ func NewConnection(uri, device, comset string, baudrate int, rtu bool) (conn met
}
if conn == nil {
return nil, errors.New("config: invalid modbus configuration: need either uri or device")
return nil, errors.New("invalid modbus configuration: need either uri or device")
}
return conn, nil
@ -70,7 +70,7 @@ func NewDevice(model string, isRS485 bool) (device meters.Device, err error) {
}
if device == nil {
err = errors.New("config: invalid modbus configuration: need either uri or device")
err = errors.New("invalid modbus configuration: need either uri or device")
}
return device, err