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

Merge branch 'concurrent-support'

Browse source 
# Conflicts:
#	.gitignore
#	viper.go
This commit is contained in:
Andrey Odintsov 2018-11-26 12:50:28 +03:00
commit b534337da7
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
viper.go
View file

@ -33,19 +33,19 @@ import (
"sync" "sync"
"time" "time"
yaml "gopkg.in/yaml.v2" "github.com/ghodss/yaml"
"github.com/fsnotify/fsnotify"
"github.com/hashicorp/hcl" "github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/printer" "github.com/hashicorp/hcl/hcl/printer"
"github.com/magiconair/properties" "github.com/magiconair/properties"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
toml "github.com/pelletier/go-toml" "github.com/nwingert/fsnotify"
"github.com/pelletier/go-toml"
"github.com/spf13/afero" "github.com/spf13/afero"
"github.com/spf13/cast" "github.com/spf13/cast"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )
// ConfigMarshalError happens when failing to marshal the configuration. // ConfigMarshalError happens when failing to marshal the configuration.
type ConfigMarshalError struct { type ConfigMarshalError struct {
@ -203,6 +203,8 @@ type Viper struct {
properties *properties.Properties properties *properties.Properties
onConfigChange func(fsnotify.Event) onConfigChange func(fsnotify.Event)
sync.Mutex
} }
// New returns an initialized Viper instance. // New returns an initialized Viper instance.
@ -952,6 +954,8 @@ func (v *Viper) BindEnv(input ...string) error {
// Viper will check to see if an alias exists first. // Viper will check to see if an alias exists first.
// Note: this assumes a lower-cased key given. // Note: this assumes a lower-cased key given.
func (v *Viper) find(lcaseKey string) interface{} { func (v *Viper) find(lcaseKey string) interface{} {
v.Lock()
defer v.Unlock()
var ( var (
val interface{} val interface{}
@ -1222,8 +1226,9 @@ func (v *Viper) ReadInConfig() error {
if err != nil { if err != nil {
return err return err
} }
v.Lock()
v.config = config v.config = config
v.Unlock()
return nil return nil
} }
@ -1647,6 +1652,9 @@ func (v *Viper) watchRemoteConfig(provider RemoteProvider) (map[string]interface
// Nested keys are returned with a v.keyDelim (= ".") separator // Nested keys are returned with a v.keyDelim (= ".") separator
func AllKeys() []string { return v.AllKeys() } func AllKeys() []string { return v.AllKeys() }
func (v *Viper) AllKeys() []string { func (v *Viper) AllKeys() []string {
v.Lock()
defer v.Unlock()
m := map[string]bool{} m := map[string]bool{}
// add all paths, by order of descending priority to ensure correct shadowing // add all paths, by order of descending priority to ensure correct shadowing
m = v.flattenAndMergeMap(m, castMapStringToMapInterface(v.aliases), "") m = v.flattenAndMergeMap(m, castMapStringToMapInterface(v.aliases), "")
@ -1656,7 +1664,6 @@ func (v *Viper) AllKeys() []string {
m = v.flattenAndMergeMap(m, v.config, "") m = v.flattenAndMergeMap(m, v.config, "")
m = v.flattenAndMergeMap(m, v.kvstore, "") m = v.flattenAndMergeMap(m, v.kvstore, "")
m = v.flattenAndMergeMap(m, v.defaults, "") m = v.flattenAndMergeMap(m, v.defaults, "")
// convert set of paths to list // convert set of paths to list
a := []string{} a := []string{}
for x := range m { for x := range m {
@ -1731,6 +1738,11 @@ func (v *Viper) AllSettings() map[string]interface{} {
// start from the list of keys, and construct the map one value at a time // start from the list of keys, and construct the map one value at a time
for _, k := range v.AllKeys() { for _, k := range v.AllKeys() {
value := v.Get(k) value := v.Get(k)
// ensure that marshalling to json will be supported
switch v := value.(type) {
case map[interface{}]interface{}:
value = castToMapStringInterface(v)
}
if value == nil { if value == nil {
// should not happen, since AllKeys() returns only keys holding a value, // should not happen, since AllKeys() returns only keys holding a value,
// check just in case anything changes // check just in case anything changes