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

less mutexes

Browse source
This commit is contained in:
autom8ter 2020-01-15 12:19:03 -07:00
parent 2849d52fa5
commit 09fc8bc4a3
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
viper.go
View file

@ -25,6 +25,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/ghodss/yaml"
"io" "io"
"log" "log"
"os" "os"
@ -551,8 +552,8 @@ func (v *Viper) providerPathExists(p *defaultRemoteProvider) bool {
// Returns nil if not found. // Returns nil if not found.
// Note: This assumes that the path entries and map keys are lower cased. // Note: This assumes that the path entries and map keys are lower cased.
func (v *Viper) searchMap(source map[string]interface{}, path []string) interface{} { func (v *Viper) searchMap(source map[string]interface{}, path []string) interface{} {
v.mu.RLock() //v.mu.RLock()
defer v.mu.RUnlock() //defer v.mu.RUnlock()
if len(path) == 0 { if len(path) == 0 {
return source return source
} }
@ -592,8 +593,8 @@ func (v *Viper) searchMap(source map[string]interface{}, path []string) interfac
// //
// Note: This assumes that the path entries and map keys are lower cased. // Note: This assumes that the path entries and map keys are lower cased.
func (v *Viper) searchMapWithPathPrefixes(source map[string]interface{}, path []string) interface{} { func (v *Viper) searchMapWithPathPrefixes(source map[string]interface{}, path []string) interface{} {
v.mu.RLock() //v.mu.RLock()
defer v.mu.Unlock() //defer v.mu.Unlock()
if len(path) == 0 { if len(path) == 0 {
return source return source
} }
@ -1462,9 +1463,11 @@ func unmarshalReader(in io.Reader, c map[string]interface{}) error {
} }
func (v *Viper) unmarshalReader(in io.Reader, c map[string]interface{}) error { func (v *Viper) unmarshalReader(in io.Reader, c map[string]interface{}) error {
v.mu.Lock() v.mu.Lock()
buf := new(bytes.Buffer)
buf.ReadFrom(in)
defer v.mu.Unlock() defer v.mu.Unlock()
buf := new(bytes.Buffer)
if _, err := buf.ReadFrom(in); err != nil {
return err
}
switch strings.ToLower(v.getConfigType()) { switch strings.ToLower(v.getConfigType()) {
case "yaml", "yml": case "yaml", "yml":
@ -1898,8 +1901,8 @@ outer:
// AllSettings merges all settings and returns them as a map[string]interface{}. // AllSettings merges all settings and returns them as a map[string]interface{}.
func AllSettings() map[string]interface{} { return v.AllSettings() } func AllSettings() map[string]interface{} { return v.AllSettings() }
func (v *Viper) AllSettings() map[string]interface{} { func (v *Viper) AllSettings() map[string]interface{} {
v.mu.Lock() //v.mu.Lock()
defer v.mu.Unlock() //defer v.mu.Unlock()
m := map[string]interface{}{} m := 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() {