fix mutex

README.md

@@ -1,6 +1,6 @@
 # JETY
 
-JSON, ENV, YAML, TOML
+JSON, ENV, TOML, YAML
 
 This is a package for collapsing multiple configuration stores (env+json, env+yaml, env+toml) and writing them back to a centralized config.
 

jety.go

@@ -107,6 +107,10 @@ func (c *ConfigManager) collapse() {
 func (c *ConfigManager) WriteConfig() error {
 	c.mutex.RLock()
 	defer c.mutex.RUnlock()
+	flattenedConfig := make(map[string]any)
+	for _, v := range c.combinedConfig {
+		flattenedConfig[v.Key] = v.Value
+	}
 	switch c.configType {
 	case ConfigTypeTOML:
 		f, err := os.Create(c.configFileUsed)
@@ -115,7 +119,7 @@ func (c *ConfigManager) WriteConfig() error {
 		}
 		defer f.Close()
 		enc := toml.NewEncoder(f)
-		err = enc.Encode(c.combinedConfig)
+		err = enc.Encode(flattenedConfig)
 		return err
 	case ConfigTypeYAML:
 		f, err := os.Create(c.configFileUsed)
@@ -124,7 +128,7 @@ func (c *ConfigManager) WriteConfig() error {
 		}
 		defer f.Close()
 		enc := yaml.NewEncoder(f)
-		err = enc.Encode(c.combinedConfig)
+		err = enc.Encode(flattenedConfig)
 		return err
 	case ConfigTypeJSON:
 		f, err := os.Create(c.configFileUsed)
@@ -133,7 +137,7 @@ func (c *ConfigManager) WriteConfig() error {
 		}
 		defer f.Close()
 		enc := json.NewEncoder(f)
-		return enc.Encode(c.combinedConfig)
+		return enc.Encode(flattenedConfig)
 	default:
 		return fmt.Errorf("config type %s not supported", c.configType)
 	}
@@ -158,8 +162,6 @@ func (c *ConfigManager) SetEnvPrefix(prefix string) {
 }
 
 func (c *ConfigManager) ReadInConfig() error {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
 	// assume config = map[string]any
 	confFileData, err := readFile(c.configFileUsed, c.configType)
 	if err != nil {
@@ -170,12 +172,18 @@ func (c *ConfigManager) ReadInConfig() error {
 		lower := strings.ToLower(k)
 		conf[lower] = ConfigMap{Key: k, Value: v}
 	}
+	c.mutex.Lock()
 	c.mapConfig = conf
+	c.mutex.Unlock()
+	c.collapse()
 	return nil
 }
 
 func readFile(filename string, fileType configType) (map[string]any, error) {
 	fileData := make(map[string]any)
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		return nil, ErrConfigFileNotFound
+	}
 	switch fileType {
 	case ConfigTypeTOML:
 		_, err := toml.DecodeFile(filename, &fileData)

setters.go

@@ -34,9 +34,13 @@ func (c *ConfigManager) SetDefault(key string, value any) {
 	lower := strings.ToLower(key)
 	c.defaultConfig[lower] = ConfigMap{Key: key, Value: value}
 	if _, ok := c.mapConfig[lower]; !ok {
-		if envVal, ok := c.envConfig[lower]; !ok {
+		if envVal, ok := c.envConfig[lower]; ok {
 			c.mapConfig[lower] = envVal
 			c.combinedConfig[lower] = envVal
+		} else {
+			c.combinedConfig[lower] = ConfigMap{Key: key, Value: value}
 		}
+	} else {
+		c.combinedConfig[lower] = c.mapConfig[lower]
 	}
 }