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

Merge cf9182539d into 01d7d76eb0

Browse source
This commit is contained in:
RajR 2019-11-13 14:17:44 +08:00 • committed by GitHub
commit e46f916bce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
viper.go
View file

@ -1639,7 +1639,7 @@ func (v *Viper) WatchRemoteConfig() error {
return v.watchKeyValueConfig() return v.watchKeyValueConfig()
} }
func (v *Viper) WatchRemoteConfigOnChannel() error { func (v *Viper) WatchRemoteConfigOnChannel() (<-chan bool, error) {
return v.watchKeyValueConfigOnChannel() return v.watchKeyValueConfigOnChannel()
} }
@ -1670,20 +1670,23 @@ func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]interface{}
} }
// Retrieve the first found remote configuration. // Retrieve the first found remote configuration.
func (v *Viper) watchKeyValueConfigOnChannel() error { func (v *Viper) watchKeyValueConfigOnChannel() (<-chan bool, error) {
wCh := make(chan bool)
for _, rp := range v.remoteProviders { for _, rp := range v.remoteProviders {
respc, _ := RemoteConfig.WatchChannel(rp) respc, _ := RemoteConfig.WatchChannel(rp)
//Todo: Add quit channel //Todo: Add quit channel
go func(rc <-chan *RemoteResponse) { go func(rc <-chan *RemoteResponse, rc2 chan<- bool) {
for { for {
b := <-rc b := <-rc
reader := bytes.NewReader(b.Value) reader := bytes.NewReader(b.Value)
v.unmarshalReader(reader, v.kvstore) v.unmarshalReader(reader, v.kvstore)
rc2 <- true
} }
}(respc) }(respc, wCh)
return nil return wCh, nil
} }
return RemoteConfigError("No Files Found") close(wCh)
return nil, RemoteConfigError("No Files Found")
} }
// Retrieve the first found remote configuration. // Retrieve the first found remote configuration.