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

Merge f55aacba8a into f17acb4fd4

Browse source
This commit is contained in:
Haixin Chen 2024-05-25 11:36:03 +02:00 • committed by GitHub
commit 6b836e99c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
viper.go
View file

@ -2000,8 +2000,13 @@ func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]any, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = v.unmarshalReader(reader, v.kvstore) kvstore := make(map[string]interface{})
return v.kvstore, err err = v.unmarshalReader(reader, kvstore)
if err != nil {
return nil, err
}
v.kvstore = kvstore
return v.kvstore, nil
} }
// Retrieve the first found remote configuration. // Retrieve the first found remote configuration.
@ -2017,7 +2022,13 @@ 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{})
err := v.unmarshalReader(reader, kvstore)
if err != nil {
v.logger.Warn(fmt.Errorf("watch remote config: %w", err).Error())
continue
}
v.kvstore = kvstore
} }
}(respc) }(respc)
return nil return nil
@ -2049,8 +2060,13 @@ func (v *Viper) watchRemoteConfig(provider RemoteProvider) (map[string]any, erro
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = v.unmarshalReader(reader, v.kvstore) kvstore := make(map[string]interface{})
return v.kvstore, err err = v.unmarshalReader(reader, kvstore)
if err != nil {
return nil, err
}
v.kvstore = kvstore
return v.kvstore, nil
} }
// 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.