From 5ff3b10f34cd40252e3c13cde45ff8a5057044bb Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Tue, 21 Sep 2021 20:58:44 +0200
Subject: [PATCH] Change the way vehicle errors are silenced

---
 cmd/config.go     | 4 +++-
 vehicle/config.go | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/config.go b/cmd/config.go
index 676d7356c..2f3b2bc98 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -12,6 +12,7 @@ import (
 	"github.com/evcc-io/evcc/push"
 	"github.com/evcc-io/evcc/server"
 	"github.com/evcc-io/evcc/vehicle"
+	"github.com/evcc-io/evcc/vehicle/wrapper"
 )
 
 type config struct {
@@ -167,7 +168,8 @@ func (cp *ConfigProvider) configureVehicles(conf config) error {
 
 		v, err := vehicle.NewFromConfig(cc.Type, cc.Other)
 		if err != nil {
-			return fmt.Errorf("cannot create vehicle '%s': %w", cc.Name, err)
+			// wrap any created errors to prevent fatals
+			v, _ = wrapper.New(v, err)
 		}
 
 		if _, exists := cp.vehicles[cc.Name]; exists {
diff --git a/vehicle/config.go b/vehicle/config.go
index a187c2b25..ba255c1b8 100644
--- a/vehicle/config.go
+++ b/vehicle/config.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/evcc-io/evcc/api"
-	"github.com/evcc-io/evcc/vehicle/wrapper"
 )
 
 const (
@@ -47,8 +46,7 @@ func NewFromConfig(typ string, other map[string]interface{}) (v api.Vehicle, err
 	factory, err := registry.Get(strings.ToLower(typ))
 	if err == nil {
 		if v, err = factory(other); err != nil {
-			// wrap any created errors to prevent fatals
-			v, err = wrapper.New(v, err)
+			err = fmt.Errorf("cannot create vehicle '%s': %w", typ, err)
 		}
 	} else {
 		err = fmt.Errorf("invalid vehicle type: %s", typ)