re
/
viper
forked from mirror/viper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marshal now gets the map via the AllSettings method 

Conflicts:
	viper.go
This commit is contained in:
Kiril Zvezdarov 2015-02-16 23:42:08 -05:00 committed by spf13
parent 700eefa74b
commit 2e2f3b2643
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
viper.go
View File

@ -350,19 +350,8 @@ 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 {
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 { if err != nil {
return err return err
} }