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

Easee: use provided context (#22111)

Browse source
This commit is contained in:
andig 2025-06-29 09:42:00 +02:00 • committed by GitHub
parent 7b59c08fb4
commit 01ae739413
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
charger/easee.go
View file

@ -70,11 +70,11 @@ type Easee struct {
}
func init() {
registry.Add("easee", NewEaseeFromConfig)
registry.AddCtx("easee", NewEaseeFromConfig)
}
// NewEaseeFromConfig creates a Easee charger from generic config
func NewEaseeFromConfig(other map[string]interface{}) (api.Charger, error) {
func NewEaseeFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {
cc := struct {
User string
Password string
@ -93,11 +93,11 @@ func NewEaseeFromConfig(other map[string]interface{}) (api.Charger, error) {
return nil, api.ErrMissingCredentials
}
return NewEasee(cc.User, cc.Password, cc.Charger, cc.Timeout, cc.Authorize)
return NewEasee(ctx, cc.User, cc.Password, cc.Charger, cc.Timeout, cc.Authorize)
}
// NewEasee creates Easee charger
func NewEasee(user, password, charger string, timeout time.Duration, authorize bool) (*Easee, error) {
func NewEasee(ctx context.Context, user, password, charger string, timeout time.Duration, authorize bool) (*Easee, error) {
log := util.NewLogger("easee").Redact(user, password)
if !sponsor.IsAuthorized() {
@ -166,7 +166,7 @@ func NewEasee(user, password, charger string, timeout time.Duration, authorize b
}
}
client, err := signalr.NewClient(context.Background(),
client, err := signalr.NewClient(ctx,
signalr.WithConnector(c.connect(ts)),
signalr.WithBackoff(func() backoff.BackOff {
return backoff.NewExponentialBackOff(backoff.WithMaxElapsedTime(0)) // prevents SignalR stack to silently give up after 15 mins
@ -180,7 +180,7 @@ func NewEasee(user, password, charger string, timeout time.Duration, authorize b
client.Start()
ctx, cancel := context.WithTimeout(context.Background(), request.Timeout)
ctx, cancel := context.WithTimeout(ctx, request.Timeout)
defer cancel()
err = <-client.WaitForState(ctx, signalr.ClientConnected)
}
@ -188,6 +188,8 @@ func NewEasee(user, password, charger string, timeout time.Duration, authorize b
// wait for first update
select {
case <-done:
case <-ctx.Done():
err = ctx.Err()
case <-time.After(request.Timeout):
err = os.ErrDeadlineExceeded
}