summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/spf13/viper/remote/remote.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/spf13/viper/remote/remote.go')
-rw-r--r--vendor/github.com/spf13/viper/remote/remote.go17
1 files changed, 7 insertions, 10 deletions
diff --git a/vendor/github.com/spf13/viper/remote/remote.go b/vendor/github.com/spf13/viper/remote/remote.go
index f100a9c7f..68a35d692 100644
--- a/vendor/github.com/spf13/viper/remote/remote.go
+++ b/vendor/github.com/spf13/viper/remote/remote.go
@@ -33,13 +33,14 @@ func (rc remoteConfigProvider) Watch(rp viper.RemoteProvider) (io.Reader, error)
if err != nil {
return nil, err
}
- resp,err := cm.Get(rp.Path())
+ resp, err := cm.Get(rp.Path())
if err != nil {
return nil, err
}
return bytes.NewReader(resp), nil
}
+
func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *viper.RemoteResponse, chan bool) {
cm, err := getConfigManager(rp)
if err != nil {
@@ -47,13 +48,13 @@ func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *vi
}
quit := make(chan bool)
quitwc := make(chan bool)
- viperResponsCh := make(chan *viper.RemoteResponse)
+ viperResponsCh := make(chan *viper.RemoteResponse)
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.RemoteResponse, quitwc <-chan bool, quit chan<- bool) {
+ go func(cr <-chan *crypt.Response, vr chan<- *viper.RemoteResponse, quitwc <-chan bool, quit chan<- bool) {
for {
select {
- case <- quitwc:
+ case <-quitwc:
quit <- true
return
case resp := <-cr:
@@ -65,15 +66,12 @@ func (rc remoteConfigProvider) WatchChannel(rp viper.RemoteProvider) (<-chan *vi
}
}
- }(cryptoResponseCh,viperResponsCh,quitwc,quit)
-
- return viperResponsCh,quitwc
+ }(cryptoResponseCh, viperResponsCh, quitwc, quit)
+ return viperResponsCh, quitwc
}
-
func getConfigManager(rp viper.RemoteProvider) (crypt.ConfigManager, error) {
-
var cm crypt.ConfigManager
var err error
@@ -99,7 +97,6 @@ func getConfigManager(rp viper.RemoteProvider) (crypt.ConfigManager, error) {
return nil, err
}
return cm, nil
-
}
func init() {