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

Cardata: fix retrying failed container setup (#33243)

Browse source
This commit is contained in:
Gabik21 2026-08-29 11:01:53 +02:00 • committed by GitHub
parent 19048976ab
commit e8b5477373
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vehicle/bmw/cardata/provider.go
View file

@ -132,18 +132,18 @@ func (v *Provider) any(key string) (any, error) {
_, tokenErr := v.ts.Token() _, tokenErr := v.ts.Token()
switch { if tokenErr == nil && (v.updated.IsZero() || time.Since(v.updated) > v.cache) {
case tokenErr == nil && v.updated.IsZero(): if v.container == "" {
// this will only happen once
if err := v.setupContainer(); err != nil { if err := v.setupContainer(); err != nil {
v.log.WARN.Println(err) v.log.WARN.Println(err)
} }
fallthrough }
case tokenErr == nil && time.Since(v.updated) > v.cache && v.container != "": if v.container != "" {
if err := v.updateContainerData(); err != nil { if err := v.updateContainerData(); err != nil {
v.log.WARN.Println(err) v.log.WARN.Println(err)
} }
}
v.updated = time.Now() v.updated = time.Now()
} }

8
vehicle/bmw/cardata/provider_test.go
View file

@ -15,7 +15,7 @@ func TestCardataStreaming(t *testing.T) {
p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{ p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{
AccessToken: "at", AccessToken: "at",
}), "client", "vin", 0) }), "client", "vin", time.Hour)
// prevent container panic // prevent container panic
p.updated = time.Now() p.updated = time.Now()
@ -51,7 +51,7 @@ func TestSocFallback(t *testing.T) {
p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{ p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{
AccessToken: "at", AccessToken: "at",
}), "client", "vin", 0) }), "client", "vin", time.Hour)
// prevent container panic // prevent container panic
p.updated = time.Now() p.updated = time.Now()
@ -108,7 +108,7 @@ func TestRangeFallback(t *testing.T) {
p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{ p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{
AccessToken: "at", AccessToken: "at",
}), "client", "vin", 0) }), "client", "vin", time.Hour)
// prevent container panic // prevent container panic
p.updated = time.Now() p.updated = time.Now()
@ -165,7 +165,7 @@ func TestStatusFallback(t *testing.T) {
p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{ p := NewProvider(ctx, util.NewLogger("foo"), nil, oauth2.StaticTokenSource(&oauth2.Token{
AccessToken: "at", AccessToken: "at",
}), "client", "vin", 0) }), "client", "vin", time.Hour)
// prevent container panic // prevent container panic
p.updated = time.Now() p.updated = time.Now()