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

chore: cleanup configuration api (#19476)

Browse source
This commit is contained in:
andig 2025-03-07 07:50:17 +01:00 • committed by GitHub
parent ec6fead5cc
commit 4c005820ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/settings/config.go
View file

@ -3,6 +3,7 @@ package settings
import (
"encoding/json"
"errors"
"sync"
"time"
"github.com/evcc-io/evcc/util"
@ -13,15 +14,18 @@ import (
var _ Settings = (*ConfigSettings)(nil)
type ConfigSettings struct {
mu sync.Mutex
log *util.Logger
conf *config.Config
}
func NewConfigSettingsAdapter(log *util.Logger, conf *config.Config) *ConfigSettings {
return &ConfigSettings{log, conf}
return &ConfigSettings{log: log, conf: conf}
}
func (s *ConfigSettings) get(key string) (any, error) {
s.mu.Lock()
defer s.mu.Unlock()
val := s.conf.Named().Other[key]
if val == nil {
return nil, errors.New("not found")
@ -29,10 +33,13 @@ func (s *ConfigSettings) get(key string) (any, error) {
return val, nil
}
// TODO remove broken error handling when settings api is retired
func (s *ConfigSettings) set(key string, val any) {
s.mu.Lock()
defer s.mu.Unlock()
data := s.conf.Named().Other
data[key] = val
if err := s.conf.PartialUpdate(data); err != nil {
if err := s.conf.Update(data); err != nil {
s.log.ERROR.Println(err)
}
}