mirror of
https://github.com/spf13/viper
synced 2024-12-23 03:57:01 +00:00
Marshal now gets the map via the AllSettings method
This commit is contained in:
parent
82cbb7dec7
commit
347c770cfb
1 changed files with 1 additions and 14 deletions
15
viper.go
15
viper.go
|
@ -313,23 +313,10 @@ func (v *viper) MarshalKey(key string, rawVal interface{}) error {
|
|||
// Marshals the config into a Struct
|
||||
func Marshal(rawVal interface{}) error { return v.Marshal(rawVal) }
|
||||
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 {
|
||||
return err
|
||||
}
|
||||
|
||||
v.insensativiseMaps()
|
||||
|
||||
return nil
|
||||
|
|
Loading…
Reference in a new issue