glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-06 20:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 59bd5de384 into 15738813a0

Browse source
This commit is contained in:
Brice Fernandes 2018-07-09 17:49:58 +00:00 • committed by GitHub
commit d1c88647e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
viper.go
View file

@ -1266,7 +1266,7 @@ func (v *Viper) writeConfig(filename string, force bool) error {
if err != nil { if err != nil {
return err return err
} }
return v.marshalWriter(f, configType) return v.MarshalWriter(f, configType)
} }
// Unmarshal a Reader into a map. // Unmarshal a Reader into a map.
@ -1329,11 +1329,13 @@ func (v *Viper) unmarshalReader(in io.Reader, c map[string]interface{}) error {
return nil return nil
} }
// Marshal a map into Writer. // MarshalWriter will marshal a map into Writer for the default config
func marshalWriter(f afero.File, configType string) error { func MarshalWriter(f afero.File, configType string) error {
return v.marshalWriter(f, configType) return v.MarshalWriter(f, configType)
} }
func (v *Viper) marshalWriter(f afero.File, configType string) error {
// MarshalWriter will marshal a map into Writer.
func (v *Viper) MarshalWriter(f afero.File, configType string) error {
c := v.AllSettings() c := v.AllSettings()
switch configType { switch configType {
case "json": case "json":