Fix hierarchical config handling

This commit is contained in:
Daniel
2020-04-28 09:56:23 +02:00
parent 6d6b03cac3
commit 97a8475364
3 changed files with 16 additions and 5 deletions

View File

@@ -5,6 +5,8 @@ import (
"fmt"
"sync"
"github.com/safing/portbase/config"
"github.com/safing/portmaster/intel/filterlists"
"github.com/safing/portmaster/profile/endpoints"
)
@@ -77,20 +79,24 @@ func updateGlobalConfigProfile(ctx context.Context, data interface{}) error {
internalSave: true,
}
newConfig := make(map[string]interface{})
// fill profile config options
for key, value := range cfgStringOptions {
profile.Config[key] = value()
newConfig[key] = value()
}
for key, value := range cfgStringArrayOptions {
profile.Config[key] = value()
newConfig[key] = value()
}
for key, value := range cfgIntOptions {
profile.Config[key] = value()
newConfig[key] = value()
}
for key, value := range cfgBoolOptions {
profile.Config[key] = value()
newConfig[key] = value()
}
// expand and assign
profile.Config = config.Expand(newConfig)
// save profile
err = profile.Save()
if err != nil && lastErr == nil {