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

removed dependency to crypt from viper.go

Browse source
This commit is contained in:
WolfgangFriedl 2017-03-15 09:03:55 +01:00
parent b912d8b835
commit 8cf063907b
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
remote/remote.go
View file

@ -40,13 +40,34 @@ func (rc remoteConfigProvider) Watch(rp viper.RemoteProvider) (io.Reader, error)
return bytes.NewReader(resp), nil
}
func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *crypt.Response, chan bool) {
func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *viper.Response, chan bool) {
cm, err := getConfigManager(rp)
if err != nil {
return nil, nil
}
quit := make(chan bool)
return cm.Watch(rp.Path(), quit) ,quit
quitwc := make(chan bool)
viperResponsCh := make(chan *viper.Response)
cryptoResponseCh := cm.Watch(rp.Path(), quit)
// need this function to convert the Channel response form crypt.Response to viper.Response
go func(cr <-chan *crypt.Response,vr chan<- *viper.Response, quitwc <-chan bool, quit chan<- bool) {
for {
select {
case <- quitwc:
quit <- true
return
case resp := <-cr:
vr <- &viper.Response{
Error: resp.Error,
Value: resp.Value,
}
}
}
}(cryptoResponseCh,viperResponsCh,quitwc,quit)
return viperResponsCh,quitwc
}

10
viper.go
View file

@ -36,11 +36,15 @@ import (
"github.com/spf13/cast"
jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/pflag"
crypt "github.com/xordataexchange/crypt/config"
)
var v *Viper
type Response struct {
Value []byte
Error error
}
func init() {
v = New()
}
@ -48,7 +52,7 @@ func init() {
type remoteConfigFactory interface {
Get(rp RemoteProvider) (io.Reader, error)
Watch(rp RemoteProvider) (io.Reader, error)
WatchChannel(rp RemoteProvider)(<-chan *crypt.Response, chan bool)
WatchChannel(rp RemoteProvider)(<-chan *Response, chan bool)
}
// RemoteConfig is optional, see the remote package
@ -1309,7 +1313,7 @@ func (v *Viper) watchKeyValueConfigOnChannel() error {
for _, rp := range v.remoteProviders {
respc, _ := RemoteConfig.WatchChannel(rp)
//Todo: Add quit channel
go func(rc <-chan *crypt.Response) {
go func(rc <-chan *Response) {
for {
b := <-rc
reader := bytes.NewReader(b.Value)