use flattened config instead of lowercased

This commit is contained in:
2023-11-03 01:52:37 -07:00
parent 0c9b84b049
commit ac7820de64

10
jety.go
View File

@@ -107,6 +107,10 @@ func (c *ConfigManager) collapse() {
func (c *ConfigManager) WriteConfig() error { func (c *ConfigManager) WriteConfig() error {
c.mutex.RLock() c.mutex.RLock()
defer c.mutex.RUnlock() defer c.mutex.RUnlock()
flattenedConfig := make(map[string]any)
for _, v := range c.combinedConfig {
flattenedConfig[v.Key] = v.Value
}
switch c.configType { switch c.configType {
case ConfigTypeTOML: case ConfigTypeTOML:
f, err := os.Create(c.configFileUsed) f, err := os.Create(c.configFileUsed)
@@ -115,7 +119,7 @@ func (c *ConfigManager) WriteConfig() error {
} }
defer f.Close() defer f.Close()
enc := toml.NewEncoder(f) enc := toml.NewEncoder(f)
err = enc.Encode(c.combinedConfig) err = enc.Encode(flattenedConfig)
return err return err
case ConfigTypeYAML: case ConfigTypeYAML:
f, err := os.Create(c.configFileUsed) f, err := os.Create(c.configFileUsed)
@@ -124,7 +128,7 @@ func (c *ConfigManager) WriteConfig() error {
} }
defer f.Close() defer f.Close()
enc := yaml.NewEncoder(f) enc := yaml.NewEncoder(f)
err = enc.Encode(c.combinedConfig) err = enc.Encode(flattenedConfig)
return err return err
case ConfigTypeJSON: case ConfigTypeJSON:
f, err := os.Create(c.configFileUsed) f, err := os.Create(c.configFileUsed)
@@ -133,7 +137,7 @@ func (c *ConfigManager) WriteConfig() error {
} }
defer f.Close() defer f.Close()
enc := json.NewEncoder(f) enc := json.NewEncoder(f)
return enc.Encode(c.combinedConfig) return enc.Encode(flattenedConfig)
default: default:
return fmt.Errorf("config type %s not supported", c.configType) return fmt.Errorf("config type %s not supported", c.configType)
} }