glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-07 12:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 888e1e5f0b into 90734830d1

Browse source
This commit is contained in:
Kiril Zvezdarov 2015-02-26 03:32:17 +00:00
commit 0926c9179c
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
viper.go
View file

@ -322,23 +322,10 @@ func (v *viper) MarshalKey(key string, rawVal interface{}) error {
// Marshals the config into a Struct // Marshals the config into a Struct
func Marshal(rawVal interface{}) error { return v.Marshal(rawVal) } func Marshal(rawVal interface{}) error { return v.Marshal(rawVal) }
func (v *viper) Marshal(rawVal interface{}) error { func (v *viper) Marshal(rawVal interface{}) error {
err := mapstructure.Decode(v.defaults, rawVal) err := mapstructure.WeakDecode(v.AllSettings(), rawVal)
if err != nil { if err != nil {
return err return err
} }
err = mapstructure.Decode(v.config, rawVal)
if err != nil {
return err
}
err = mapstructure.Decode(v.override, rawVal)
if err != nil {
return err
}
err = mapstructure.Decode(v.kvstore, rawVal)
if err != nil {
return err
}
v.insensativiseMaps() v.insensativiseMaps()
return nil return nil
@ -655,6 +642,14 @@ func (v *viper) AllKeys() []string {
m[key] = struct{}{} m[key] = struct{}{}
} }
for key, _ := range v.env {
m[key] = struct{}{}
}
for key, _ := range v.pflags {
m[key] = struct{}{}
}
for key, _ := range v.override { for key, _ := range v.override {
m[key] = struct{}{} m[key] = struct{}{}
} }