RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-13 02:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

confenv: cleanup

Browse Source
This commit is contained in:
aler9 2020-10-30 23:08:09 +01:00
parent 19bb58404f
commit 85e12d7b93
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
confenv/confenv.go
View File

@ -74,26 +74,30 @@ func load(env map[string]string, envKey string, rv reflect.Value) error {
continue continue
} }
tmp := strings.Split(k[len(envKey+"_"):], "_") mapKey := strings.Split(k[len(envKey+"_"):], "_")[0]
mapKey := tmp[0]
if len(mapKey) == 0 { if len(mapKey) == 0 {
continue continue
} }
mapKey = strings.ToLower(mapKey)
// allow only keys in uppercase
if mapKey != strings.ToUpper(mapKey) {
continue
}
// initialize only if there's at least one key // initialize only if there's at least one key
if rv.IsNil() { if rv.IsNil() {
rv.Set(reflect.MakeMap(rt)) rv.Set(reflect.MakeMap(rt))
} }
nv := rv.MapIndex(reflect.ValueOf(mapKey)) mapKeyLower := strings.ToLower(mapKey)
nv := rv.MapIndex(reflect.ValueOf(mapKeyLower))
zero := reflect.Value{} zero := reflect.Value{}
if nv == zero { if nv == zero {
nv = reflect.New(rt.Elem().Elem()) nv = reflect.New(rt.Elem().Elem())
rv.SetMapIndex(reflect.ValueOf(mapKey), nv) rv.SetMapIndex(reflect.ValueOf(mapKeyLower), nv)
} }
err := load(env, envKey+"_"+strings.ToUpper(mapKey), nv.Elem()) err := load(env, envKey+"_"+mapKey, nv.Elem())
if err != nil { if err != nil {
return err return err
} }
@ -110,8 +114,7 @@ func load(env map[string]string, envKey string, rv reflect.Value) error {
continue continue
} }
fieldEnvKey := envKey + "_" + strings.ToUpper(f.Name) err := load(env, envKey+"_"+strings.ToUpper(f.Name), rv.Field(i))
err := load(env, fieldEnvKey, rv.Field(i))
if err != nil { if err != nil {
return err return err
} }