glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-06-30 23:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix panic when continue using WatchRemoteConfig

Browse source
This commit is contained in:
leu1205 2020-05-08 14:01:11 +08:00
parent c6ee9808ab
commit 57c50704df
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
viper.go
View file

@ -1775,7 +1775,9 @@ func (v *Viper) watchKeyValueConfigOnChannel() error {
for { for {
b := <-rc b := <-rc
reader := bytes.NewReader(b.Value) reader := bytes.NewReader(b.Value)
v.unmarshalReader(reader, v.kvstore) kvstore := make(map[string]interface{}, len(v.kvstore))
v.unmarshalReader(reader, kvstore)
v.kvstore = kvstore
} }
}(respc) }(respc)
return nil return nil
@ -1801,8 +1803,9 @@ func (v *Viper) watchRemoteConfig(provider RemoteProvider) (map[string]interface
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = v.unmarshalReader(reader, v.kvstore) kvstore := make(map[string]interface{}, len(v.kvstore))
return v.kvstore, err err = v.unmarshalReader(reader, kvstore)
return kvstore, err
} }
// AllKeys returns all keys holding a value, regardless of where they are set. // AllKeys returns all keys holding a value, regardless of where they are set.